Resolve conflict in locale/gitlab.pot

ffcf615d · Winnie Hellmann · e865716d · ffcf615d
Commit ffcf615d authored Aug 20, 2018 by Winnie Hellmann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

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

No files found.
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -7716,11 +7716,10 @@ msgstr ""
 msgid "Verified"
 msgstr ""

-<<<<<<< HEAD
-msgid "View epics list"
-=======
 msgid "Version"
->>>>>>> 10a680ba04b... add i18n support to admin runners page
+msgstr ""
+
+msgid "View epics list"
 msgstr ""

 msgid "View file @ "