Resolve conflicts in locale/gitlab.pot

4df63116 · Stan Hu · 5b60f612 · 4df63116
Commit 4df63116 authored Oct 23, 2018 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 9 deletions

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

No files found.
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -5254,12 +5254,9 @@ msgstr ""
 msgid "No"
 msgstr ""
-<<<<<<< HEAD
-=======
 msgid "No Assignee"
 msgstr ""
->>>>>>> upstream/master
 msgid "No Label"
 msgstr ""
@@ -7239,7 +7236,6 @@ msgstr ""
 msgid "Something went wrong while closing the %{issuable}. Please try again later"
 msgstr ""
-<<<<<<< HEAD
 msgid "Something went wrong while fetching %{listType} list"
 msgstr ""
@@ -7249,11 +7245,6 @@ msgstr ""
 msgid "Something went wrong while fetching group member contributions"
 msgstr ""
-=======
-msgid "Something went wrong while fetching comments. Please try again."
-msgstr ""
->>>>>>> upstream/master
 msgid "Something went wrong while fetching the projects."
 msgstr ""