Resolve locale/gitlab.pot

f3971fd5 · Robert Speicher · a4e863e8 · f3971fd5
Commit f3971fd5 authored Sep 21, 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
@@ -438,11 +438,10 @@ msgstr ""
 msgid "Add users to group"
 msgstr ""
-<<<<<<< HEAD
-msgid "Additional text"
-=======
 msgid "Adding new applications is disabled in your GitLab instance. Please contact your GitLab administrator to get the permission"
->>>>>>> upstream/master
+msgstr ""
+msgid "Additional text"
 msgstr ""
 msgid "Admin Area"