Resolve locale/gitlab.pot

3021a361 · George Tsiolis · 5dab034c · 3021a361
Commit 3021a361 authored Nov 29, 2018 by George Tsiolis
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

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

No files found.
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -6838,11 +6838,7 @@ msgstr ""
 msgid "Provider"
 msgstr ""

-<<<<<<< HEAD
-msgid "Pseudonymizer data collection"
-=======
 msgid "Public"
->>>>>>> upstream/master
 msgstr ""

 msgid "Public - The group and any public projects can be viewed without any authentication."