Resolve conflicts in locale/gitlab.pot

ff7b373d · Stan Hu · 8a0e461f · ff7b373d
Commit ff7b373d authored Nov 08, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -9912,12 +9912,9 @@ msgstr ""
 msgid "remove due date"
 msgstr ""

-<<<<<<< HEAD
 msgid "remove weight"
 msgstr ""

-=======
->>>>>>> upstream/master
 msgid "reply"
 msgid_plural "replies"
 msgstr[0] ""