resolve conflict in locale/gitlab.pot

locale/gitlab.pot

@@ -5400,9 +5400,6 @@ msgstr ""
 msgid "Remove project"
 msgstr ""
 
-<<<<<<< HEAD
-msgid "Repair authentication"
-=======
 msgid "Rename"
 msgstr ""
 
@@ -5410,18 +5407,17 @@ msgid "Rename file"
 msgstr ""
 
 msgid "Rename folder"
->>>>>>> upstream/master
+msgstr ""
+
+msgid "Repair authentication"
 msgstr ""
 
 msgid "Reply to this email directly or %{view_it_on_gitlab}."
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Repo by URL"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Reports|%{failedString} and %{resolvedString}"
 msgstr ""