resolve conflict in locale/gitlab.pot

1550dfb5 · Lukas Eipert · f9c7d650 · 1550dfb5
Commit 1550dfb5 authored Sep 08, 2018 by Lukas Eipert
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
@@ -7443,14 +7443,13 @@ msgstr ""
 msgid "This branch has changed since you started editing. Would you like to create a new branch?"
 msgstr ""

-<<<<<<< HEAD
+msgid "This container registry has been scheduled for deletion."
+msgstr ""
+
 msgid "This date is after the planned finish date, so this epic won't appear in the roadmap."
 msgstr ""

 msgid "This date is before the planned start date, so this epic won't appear in the roadmap."
-=======
-msgid "This container registry has been scheduled for deletion."
->>>>>>> upstream/master
 msgstr ""

 msgid "This diff is collapsed."