Skip to content

G
gitlab-ce
Commit 78e34c67 authored by Lukas Eipert's avatar Lukas Eipert
Browse files
Options

resolve conflict in locale/gitlab.pot

parent 61f18e90
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 7 deletions
locale/gitlab.pot
View file @ 78e34c67
...@@ -5400,9 +5400,6 @@ msgstr "" ...@@ -5400,9 +5400,6 @@ msgstr ""
msgid "Remove project" msgid "Remove project"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Repair authentication"
=======
msgid "Rename" msgid "Rename"
msgstr "" msgstr ""
...@@ -5410,18 +5407,17 @@ msgid "Rename file" ...@@ -5410,18 +5407,17 @@ msgid "Rename file"
msgstr "" msgstr ""
msgid "Rename folder" msgid "Rename folder"
>>>>>>> upstream/master msgstr ""
msgid "Repair authentication"
msgstr "" msgstr ""
msgid "Reply to this email directly or %{view_it_on_gitlab}." msgid "Reply to this email directly or %{view_it_on_gitlab}."
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Repo by URL" msgid "Repo by URL"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Reports|%{failedString} and %{resolvedString}" msgid "Reports|%{failedString} and %{resolvedString}"
msgstr "" msgstr ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7