Resolve conflict in locale/gitlab.pot

0f649d14 · Winnie Hellmann · 802fa98b · 0f649d14
Commit 0f649d14 authored Nov 29, 2018 by Winnie Hellmann
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 16 deletions

locale/gitlab.pot locale/gitlab.pot +12 -16

No files found.
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -5244,6 +5244,18 @@ msgstr ""
 msgid "MergeRequests|View replaced file @ %{commitId}"
 msgstr ""

+msgid "MergeRequests|started a discussion"
+msgstr ""
+
+msgid "MergeRequests|started a discussion on %{linkStart}an old version of the diff%{linkEnd}"
+msgstr ""
+
+msgid "MergeRequests|started a discussion on %{linkStart}the diff%{linkEnd}"
+msgstr ""
+
+msgid "MergeRequests|started a discussion on commit %{linkStart}%{commitId}%{linkEnd}"
+msgstr ""
+
 msgid "MergeRequest| %{paragraphStart}changed the description %{descriptionChangedTimes} times %{timeDifferenceMinutes}%{paragraphEnd}"
 msgstr ""

@@ -5331,23 +5343,7 @@ msgstr ""
 msgid "Metrics|System"
 msgstr ""

-<<<<<<< HEAD
 msgid "Metrics|There was an error fetching the environments data, please try again"
-=======
-msgid "MergeRequests|started a discussion"
-msgstr ""
-
-msgid "MergeRequests|started a discussion on %{linkStart}an old version of the diff%{linkEnd}"
-msgstr ""
-
-msgid "MergeRequests|started a discussion on %{linkStart}the diff%{linkEnd}"
-msgstr ""
-
-msgid "MergeRequests|started a discussion on commit %{linkStart}%{commitId}%{linkEnd}"
-msgstr ""
-
-msgid "MergeRequest| %{paragraphStart}changed the description %{descriptionChangedTimes} times %{timeDifferenceMinutes}%{paragraphEnd}"
->>>>>>> upstream/master
 msgstr ""

 msgid "Metrics|There was an error getting deployment information."