Resolve locale/gitlab.pot

43229f26 · Sean McGivern · e874e20f · 43229f26
Commit 43229f26 authored Aug 28, 2018 by Sean McGivern
Hide 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
@@ -6971,11 +6971,10 @@ msgstr ""
 msgid "The collection of events added to the data gathered for that stage."
 msgstr ""

-<<<<<<< HEAD
 msgid "The connection will time out after %{timeout}. For repositories that take longer, use a clone/push combination."
-=======
+msgstr ""
+
 msgid "The deployment of this job to %{environmentLink} did not succeed."
->>>>>>> upstream/master
 msgstr ""

 msgid "The fork relationship has been removed."