Resolve locale/gitlab.pot

4f72e2b1 · Robert Speicher · ebcfdf64 · 4f72e2b1
Commit 4f72e2b1 authored Oct 02, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 10 deletions

locale/gitlab.pot locale/gitlab.pot +8 -10

No files found.
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -2640,14 +2640,13 @@ msgstr ""
 msgid "Details"
 msgstr ""
-<<<<<<< HEAD
 msgid "Detect host keys"
-=======
+msgstr ""
 msgid "Diff content limits"
 msgstr ""
 msgid "Diff limits"
->>>>>>> upstream/master
 msgstr ""
 msgid "Diffs|No file name available"
@@ -4602,12 +4601,6 @@ msgstr ""
 msgid "Markdown enabled"
 msgstr ""
-<<<<<<< HEAD
-msgid "Maven Metadata"
-msgstr ""
-msgid "Maven package"
-=======
 msgid "MarkdownToolbar|Add a bullet list"
 msgstr ""
@@ -4633,7 +4626,12 @@ msgid "MarkdownToolbar|Insert a quote"
 msgstr ""
 msgid "MarkdownToolbar|Insert code"
->>>>>>> upstream/master
+msgstr ""
+msgid "Maven Metadata"
+msgstr ""
+msgid "Maven package"
 msgstr ""
 msgid "Max access level"