Resolve conflicts in locale/gitlab.pot

45405202 · Stan Hu · c3bde0aa · 45405202
Commit 45405202 authored Nov 09, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

locale/gitlab.pot locale/gitlab.pot +0 -3

No files found.
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1861,12 +1861,9 @@ msgstr ""
 msgid "ClusterIntegration|Kubernetes cluster details"
 msgstr ""
-<<<<<<< HEAD
 msgid "ClusterIntegration|Kubernetes cluster health"
 msgstr ""
-=======
->>>>>>> upstream/master
 msgid "ClusterIntegration|Kubernetes cluster is being created on Google Kubernetes Engine..."
 msgstr ""