Fix conflict in locale/gitlab.pot

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fix conflict in locale/gitlab.pot
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
ebeaf2df · Dmitriy Zaporozhets · 4f827d1e · ebeaf2df
Commit ebeaf2df authored Jul 11, 2018 by Dmitriy Zaporozhets
Hide 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,11 +8,6 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2018-07-10 13:57-0500\n"
-"PO-Revision-Date: 2018-07-10 13:57-0500\n"
-=======
->>>>>>> upstream/master
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"