Resolve other conflicts in locale/gitlab.pot

004c17d3 · Stan Hu · 5320fecc · 004c17d3
Commit 004c17d3 authored May 16, 2018 by Stan Hu
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
@@ -100,12 +100,9 @@ msgstr[1] ""
 msgid "%{loadingIcon} Started"
 msgstr ""

-<<<<<<< HEAD
 msgid "%{lock_path} is locked by GitLab User %{lock_user_id}"
 msgstr ""

-=======
->>>>>>> upstream/master
 msgid "%{nip_domain} can be used as an alternative to a custom domain."
 msgstr ""