Fixed locale conflict

5258f9cb · Jan Provaznik · b061e72a · 5258f9cb
Commit 5258f9cb authored Sep 07, 2018 by Jan Provaznik
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -3886,15 +3886,12 @@ msgid "GroupsTree|No groups or projects matched your search"
 msgstr ""
 msgid "GroupsTree|Search by name"
-<<<<<<< HEAD
 msgstr ""
 msgid "Have your users email"
 msgstr ""
 msgid "Header message"
-=======
->>>>>>> upstream/master
 msgstr ""
 msgid "Health Check"