Resolve conflict in `locale/gitlab.pot`

22e9798d · Lukas Eipert · a322b022 · 22e9798d
Commit 22e9798d authored Sep 07, 2018 by Lukas Eipert
Show 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
@@ -1751,12 +1751,9 @@ msgstr ""
 msgid "ClusterIntegration|Kubernetes cluster details"
 msgstr ""
-<<<<<<< HEAD
 msgid "ClusterIntegration|Kubernetes cluster health"
 msgstr ""
-=======
->>>>>>> upstream/master
 msgid "ClusterIntegration|Kubernetes cluster integration"
 msgstr ""