Fix CE to EE merge conflict on gitlab.pot

b116c1ef · Olivier Gonzalez · 3cea4698 · b116c1ef
Commit b116c1ef authored Jun 18, 2018 by Olivier Gonzalez
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 8 deletions

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

No files found.
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -8,13 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2018-06-13 10:31-0400\n"
-"PO-Revision-Date: 2018-06-13 10:31-0400\n"
-=======
 "POT-Creation-Date: 2018-06-13 14:05+0200\n"
 "PO-Revision-Date: 2018-06-13 14:05+0200\n"
->>>>>>> upstream/master
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -2621,17 +2616,16 @@ msgstr ""
 msgid "GeoNodes|Does not match the primary storage configuration"
 msgstr ""

-<<<<<<< HEAD
 msgid "GeoNodes|Failed"
 msgstr ""

 msgid "GeoNodes|Full"
-=======
+msgstr ""
+
 msgid "Gitaly Servers"
 msgstr ""

 msgid "Gitaly|Address"
->>>>>>> upstream/master
 msgstr ""

 msgid "GeoNodes|GitLab version"