Resolve locale/gitlab.pot

70771e43 · André Luís · 5e412e2c · 70771e43
Commit 70771e43 authored Oct 06, 2018 by André Luís
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

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

No files found.
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -404,14 +404,13 @@ msgstr ""
 msgid "Add Readme"
 msgstr ""

-<<<<<<< HEAD
 msgid "Add additional text to appear in all email communications. %{character_limit} character limit"
 msgstr ""

 msgid "Add comment now"
-=======
+msgstr ""
+
 msgid "Add a table"
->>>>>>> upstream/master
 msgstr ""

 msgid "Add license"