Resolve locale/gitlab.pot

7db273a5 · Lin Jen-Shin · e34cc521 · 7db273a5
Commit 7db273a5 authored Jul 23, 2018 by Lin Jen-Shin
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
@@ -5000,12 +5000,9 @@ msgstr ""
 msgid "PrometheusService|Common metrics are automatically monitored based on a library of metrics from popular exporters."
 msgstr ""

-<<<<<<< HEAD
 msgid "PrometheusService|Custom metrics"
 msgstr ""

-=======
->>>>>>> upstream/master
 msgid "PrometheusService|Finding and configuring metrics..."
 msgstr ""