Fix conflicts for locale/gitlab.pot

82e61ef4 · Filipa Lacerda · 9d2bf4fb · 82e61ef4
Commit 82e61ef4 authored Oct 22, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -8526,12 +8526,9 @@ msgstr ""
 msgid "View app"
 msgstr ""

-<<<<<<< HEAD
 msgid "View epics list"
 msgstr ""

-=======
->>>>>>> upstream/master
 msgid "View file @ "
 msgstr ""