Resolve locale/gitlab.pot

d5bbc475 · Robert Speicher · 4f0a69a0 · d5bbc475
Commit d5bbc475 authored Aug 14, 2018 by Robert Speicher
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
@@ -4067,14 +4067,13 @@ msgstr ""
 msgid "Jobs"
 msgstr ""

-<<<<<<< HEAD
-msgid "Job|This job is stuck, because the project doesn't have any runners online assigned to it."
-=======
 msgid "Job|Job has been erased"
 msgstr ""

 msgid "Job|Job has been erased by"
->>>>>>> upstream/master
+msgstr ""
+
+msgid "Job|This job is stuck, because the project doesn't have any runners online assigned to it."
 msgstr ""

 msgid "Jul"