Fixed gilab.pot file

- Ran script - Removed accidental merge conflics

Fixed gilab.pot file
- Ran script - Removed accidental merge conflics
cf6d588a · Roman Kuba · c106a612 · cf6d588a
Commit cf6d588a authored Aug 13, 2020 by Roman Kuba
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 9 deletions

locale/gitlab.pot locale/gitlab.pot +0 -9

No files found.
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -7899,8 +7899,6 @@ msgstr ""
 msgid "Deleted chat nickname: %{chat_name}!"
 msgstr ""

-<<<<<<< HEAD
-<<<<<<< HEAD
 msgid "Deleted in this version"
 msgstr ""

@@ -7910,13 +7908,6 @@ msgstr ""
 msgid "Deleted projects cannot be restored!"
 msgstr ""

-=======
->>>>>>> 086fa509029... Use "archive" in design management
-=======
-msgid "Deleted in this version"
-msgstr ""
-
->>>>>>> 5918a4550f2... Update modal text
 msgid "Deleting"
 msgstr ""