resolve conflicts in gitlab.pot

dd4a78d9 · Mike Greiling · 89af7d67 · dd4a78d9
Commit dd4a78d9 authored Sep 18, 2018 by Mike Greiling
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

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

No files found.
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1736,15 +1736,9 @@ msgstr ""
 msgid "ClusterIntegration|Install"
 msgstr ""

-<<<<<<< HEAD
 msgid "ClusterIntegration|Install Prometheus"
 msgstr ""

-msgid "ClusterIntegration|Install applications on your Kubernetes cluster. Read more about %{helpLink}"
-msgstr ""
-
-=======
->>>>>>> upstream/master
 msgid "ClusterIntegration|Installed"
 msgstr ""