Resolve conflicts with locale/gitlab.pot

8334b393 · Ian Baum · 0f73b29f · 8334b393
Commit 8334b393 authored Feb 06, 2018 by Ian Baum
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

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

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-02-06 12:32+0100\n"
-"PO-Revision-Date: 2018-02-06 12:32+0100\n"
-=======
 "POT-Creation-Date: 2018-02-06 10:02+0100\n"
 "PO-Revision-Date: 2018-02-06 10:02+0100\n"
->>>>>>> upstream/master
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"