Fix conflicts for locale/gitlab.pot

55dd4c4a · Filipa Lacerda · 31f42749 · 55dd4c4a
Commit 55dd4c4a authored Nov 22, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 7 deletions

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

No files found.
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -599,15 +599,15 @@ msgstr ""
 msgid "An error has occurred"
 msgstr ""

-msgid "An error occurred creating the new branch."
-msgstr ""
-
 msgid "An error occurred adding a draft to the discussion."
 msgstr ""

 msgid "An error occurred adding a new draft."
 msgstr ""

+msgid "An error occurred creating the new branch."
+msgstr ""
+
 msgid "An error occurred previewing the blob"
 msgstr ""

@@ -1597,14 +1597,10 @@ msgstr ""
 msgid "CiVariable|All environments"
 msgstr ""

-<<<<<<< HEAD
 msgid "CiVariable|Create wildcard"
 msgstr ""

-msgid "CiVariable|Error occured while saving variables"
-=======
 msgid "CiVariable|Error occurred while saving variables"
->>>>>>> upstream/master
 msgstr ""

 msgid "CiVariable|New environment"