Resolve CE-EE conflict in locale/gitlab.pot

locale/gitlab.pot

@@ -171,12 +171,9 @@ msgstr ""
 msgid "%{percent}%% complete"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "%{state} epics"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "%{strong_start}%{branch_count}%{strong_end} Branch"
 msgid_plural "%{strong_start}%{branch_count}%{strong_end} Branches"
 msgstr[0] ""
@@ -420,7 +417,6 @@ msgstr ""
 msgid "Activity"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Add"
 msgstr ""
 
@@ -434,12 +430,6 @@ msgid "Add Group Webhooks and GitLab Enterprise Edition."
 msgstr ""
 
 msgid "Add Jaeger URL"
-=======
-msgid "Add CHANGELOG"
-msgstr ""
-
-msgid "Add CONTRIBUTING"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "Add Kubernetes cluster"
@@ -1755,26 +1745,10 @@ msgstr ""
 msgid "Client authentication certificate"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Client authentication key"
 msgstr ""
 
 msgid "Client authentication key password"
-=======
-msgid "Clone"
-msgstr ""
-
-msgid "Clone repository"
-msgstr ""
-
-msgid "Clone with %{http_label}"
-msgstr ""
-
-msgid "Clone with SSH"
-msgstr ""
-
-msgid "Close"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "Clients"
@@ -2467,12 +2441,9 @@ msgid "Contribution Charts"
 msgstr ""
 
 msgid "Contributions for <strong>%{calendar_date}</strong>"
-<<<<<<< HEAD
 msgstr ""
 
 msgid "Contributions per group member"
-=======
->>>>>>> upstream/master
 msgstr ""
 
 msgid "Contributors"
@@ -3680,12 +3651,9 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Fill in the fields below, turn on <strong>%{enable_label}</strong>, and press <strong>%{save_changes}</strong>"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Filter"
 msgstr ""
 
@@ -3848,14 +3816,7 @@ msgstr ""
 msgid "Geo Nodes"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Geo allows you to replicate your GitLab instance to other geographical locations."
-=======
-msgid "Git global setup"
-msgstr ""
-
-msgid "Git repository URL"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "GeoNodeSyncStatus|Node is failing or broken."