Resolve conflict in locale/gitlab.pot

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflict in locale/gitlab.pot
Signed-off-by: Rémy Coutable <remy@rymai.me>
7f6eeb70 · Rémy Coutable · 2250df94 · 7f6eeb70
Commit 7f6eeb70 authored Jul 18, 2018 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

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

No files found.
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -8,13 +8,6 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2018-07-17 07:12+0000\n"
-"PO-Revision-Date: 2018-07-17 07:12+0000\n"
-=======
-"POT-Creation-Date: 2018-07-10 16:02-0700\n"
-"PO-Revision-Date: 2018-07-10 16:02-0700\n"
->>>>>>> upstream/master
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"