Resolve locale/gitlab.pot

51452029 · Marin Jankovski · 3b37d001 · 51452029
Commit 51452029 authored Feb 03, 2019 by Marin Jankovski
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
@@ -5809,7 +5809,6 @@ msgstr ""
 msgid "Metrics|Learn about environments"
 msgstr ""
-<<<<<<< HEAD
 msgid "Metrics|Legend label (optional)"
 msgstr ""
@@ -5822,8 +5821,6 @@ msgstr ""
 msgid "Metrics|New metric"
 msgstr ""
-=======
->>>>>>> upstream/master
 msgid "Metrics|No deployed environments"
 msgstr ""
@@ -7307,7 +7304,6 @@ msgstr ""
 msgid "ProjectsDropdown|This feature requires browser localStorage support"
 msgstr ""
-<<<<<<< HEAD
 msgid "PrometheusAlerts|Add alert"
 msgstr ""
@@ -7338,8 +7334,6 @@ msgstr ""
 msgid "PrometheusAlerts|Threshold"
 msgstr ""
-=======
->>>>>>> upstream/master
 msgid "PrometheusService|%{exporters} with %{metrics} were found"
 msgstr ""