CE->EE: Resolve conflicts in locale/gitlab.pot

locale/gitlab.pot

@@ -641,7 +641,6 @@ msgstr ""
 msgid "An error occurred when toggling the notification subscription"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "An error occurred when updating the issue weight"
 msgstr ""
 
@@ -651,8 +650,6 @@ msgstr ""
 msgid "An error occurred while deleting the comment"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "An error occurred while detecting host keys"
 msgstr ""
 
@@ -3520,12 +3517,9 @@ msgstr ""
 msgid "Fingerprints"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Finish review"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Finished"
 msgstr ""
 
@@ -4282,12 +4276,6 @@ msgstr ""
 msgid "Hide host keys manual input"
 msgstr ""
 
-msgid "Here is the public SSH key that needs to be added to the remote server. For more information, please refer to the documentation."
-msgstr ""
-
-msgid "Hide host keys manual input"
-msgstr ""
-
 msgid "Hide payload"
 msgstr ""