Resolve locale/gitlab.pot

Signed-off-by: Rémy Coutable <remy@rymai.me>

locale/gitlab.pot

@@ -4916,7 +4916,9 @@ msgstr ""
 msgid "ProjectLifecycle|Stage"
 msgstr ""
 
-<<<<<<< HEAD
+msgid "ProjectPage|Project ID: %{project_id}"
+msgstr ""
+
 msgid "ProjectSettings|Contact an admin to change this setting."
 msgstr ""
 
@@ -4939,9 +4941,6 @@ msgid "ProjectSettings|This setting will be applied to all projects unless overr
 msgstr ""
 
 msgid "ProjectSettings|Users can only push commits to this repository that were committed with one of their own verified emails."
-=======
-msgid "ProjectPage|Project ID: %{project_id}"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "Projects"
@@ -7064,7 +7063,6 @@ msgstr ""
 msgid "branch name"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "by"
 msgstr ""
 
@@ -7275,11 +7273,6 @@ msgstr ""
 msgid "ciReport|on pipeline"
 msgstr ""
 
-=======
-msgid "ciReport|Show complete code vulnerabilities report"
-msgstr ""
-
->>>>>>> upstream/master
 msgid "command line instructions"
 msgstr ""