Fixing partial resolve of locale/gitlab.pot

locale/gitlab.pot

@@ -165,12 +165,9 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "All changes are committed"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Allows you to add and manage Kubernetes clusters."
 msgstr ""
 
@@ -180,17 +177,13 @@ msgstr ""
 msgid "An error occurred when toggling the notification subscription"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "An error occurred when updating the issue weight"
 msgstr ""
 
-msgid "An error occurred while dismissing the feature highlight. Refresh the page and try dismissing again."
-=======
 msgid "An error occurred while dismissing the feature highlight. Refresh the page and try dismissing again."
 msgstr ""
 
 msgid "An error occurred while fetching markdown preview"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "An error occurred while fetching sidebar data"
@@ -498,12 +491,9 @@ msgstr ""
 msgid "Cannot modify managed Kubernetes cluster"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Change Weight"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "ChangeTypeActionLabel|Pick into branch"
 msgstr ""
 
@@ -651,15 +641,12 @@ msgstr ""
 msgid "Clone repository"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Close"
 msgstr ""
 
 msgid "Closed"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "ClusterIntegration|%{appList} was successfully installed on your Kubernetes cluster"
 msgstr ""
 
@@ -814,12 +801,9 @@ msgid "ClusterIntegration|Make sure your account %{link_to_requirements} to crea
 msgstr ""
 
 msgid "ClusterIntegration|Manage your Kubernetes cluster by visiting %{link_gke}"
-<<<<<<< HEAD
 msgstr ""
 
 msgid "ClusterIntegration|Multiple Kubernetes clusters are available in GitLab Enterprise Edition Premium and Ultimate"
-=======
->>>>>>> upstream/master
 msgstr ""
 
 msgid "ClusterIntegration|Note:"
@@ -1706,14 +1690,11 @@ msgstr ""
 msgid "Install a Runner compatible with GitLab CI"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Instance"
 msgid_plural "Instances"
 msgstr[0] ""
 msgstr[1] ""
 
-=======
->>>>>>> upstream/master
 msgid "Instance does not support multiple Kubernetes clusters"
 msgstr ""
 
@@ -1929,12 +1910,9 @@ msgstr ""
 msgid "More information is available|here"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Multiple issue boards"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "New Issue"
 msgid_plural "New Issues"
 msgstr[0] ""
@@ -3741,9 +3719,5 @@ msgstr ""
 msgid "username"
 msgstr ""
 
-<<<<<<< HEAD
-msgid "uses clusters to deploy your code!"
-=======
 msgid "uses Kubernetes clusters to deploy your code!"
->>>>>>> upstream/master
 msgstr ""