Resolve conflict in locale/gitlab.pot

16773d52 · Winnie Hellmann · 7f3f48f4 · 16773d52
Commit 16773d52 authored Jul 23, 2018 by Winnie Hellmann
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

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

No files found.
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -542,14 +542,10 @@ msgstr ""
 msgid "An error occurred while importing project: ${details}"
 msgstr ""

-<<<<<<< HEAD
 msgid "An error occurred while initializing path locks"
 msgstr ""

-msgid "An error occurred while loading commits"
-=======
 msgid "An error occurred while loading commit signatures"
->>>>>>> upstream/master
 msgstr ""

 msgid "An error occurred while loading diff"