Resolve locale/gitlab.pot

locale/gitlab.pot

@@ -1450,15 +1450,12 @@ msgstr ""
 msgid "Cannot modify managed Kubernetes cluster"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Certificate fingerprint"
 msgstr ""
 
 msgid "Change Weight"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Change permissions"
 msgstr ""
 
@@ -3772,14 +3769,7 @@ msgstr ""
 msgid "GeoNodes|Learn more about Wiki checksum progress"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "GeoNodes|Learn more about Wiki verification"
-=======
-msgid "Given access %{time_ago}"
-msgstr ""
-
-msgid "Go Back"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "GeoNodes|Loading nodes"
@@ -3803,14 +3793,7 @@ msgstr ""
 msgid "GeoNodes|Node was successfully removed."
 msgstr ""
 
-<<<<<<< HEAD
 msgid "GeoNodes|Not checksummed"
-=======
-msgid "Grant access"
-msgstr ""
-
-msgid "Graph"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "GeoNodes|Out of sync"
@@ -4657,7 +4640,6 @@ msgstr ""
 msgid "Issues, merge requests, pushes and comments."
 msgstr ""
 
-<<<<<<< HEAD
 msgid "IssuesAnalytics|After you begin creating issues for your projects, we can start tracking and displaying metrics for them"
 msgstr ""
 
@@ -4688,11 +4670,6 @@ msgstr ""
 msgid "Jaeger tracing"
 msgstr ""
 
-=======
-msgid "It's you"
-msgstr ""
-
->>>>>>> upstream/master
 msgid "Jan"
 msgstr ""