Fix conflicts for locale/gitlab.pot

436c1881 · Filipa Lacerda · b5936931 · 436c1881
Commit 436c1881 authored Oct 31, 2018 by Filipa Lacerda
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

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

No files found.
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -3921,11 +3921,10 @@ msgstr ""
 msgid "Group Runners"
 msgstr ""

-<<<<<<< HEAD
 msgid "Group SAML must be enabled to test"
-=======
+msgstr ""
+
 msgid "Group URL"
->>>>>>> upstream/master
 msgstr ""

 msgid "Group avatar"