Resolve conflict in locale/gitlab.pot

e4ec018d · Lukas Eipert · 94362cd4 · e4ec018d
Commit e4ec018d authored Oct 05, 2018 by Lukas Eipert
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
@@ -8674,12 +8674,9 @@ msgstr ""
 msgid "You do not have any subscriptions yet"
 msgstr ""

-<<<<<<< HEAD
 msgid "You do not have the correct permissions to override the settings from the LDAP group sync."
 msgstr ""

-=======
->>>>>>> upstream/master
 msgid "You don't have any applications"
 msgstr ""