Skip to content

G
gitlab-ce
Commit 11a86807 authored by Stan Hu's avatar Stan Hu
Browse files
Options

Resolve conflicts in local/gitlab.pot

parent 68d3119c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
locale/gitlab.pot
View file @ 11a86807
...@@ -8500,7 +8500,6 @@ msgstr "" ...@@ -8500,7 +8500,6 @@ msgstr ""
msgid "importing" msgid "importing"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "instance completed" msgid "instance completed"
msgid_plural "instances completed" msgid_plural "instances completed"
msgstr[0] "" msgstr[0] ""
...@@ -8513,9 +8512,9 @@ msgid "is invalid because there is upstream lock" ...@@ -8513,9 +8512,9 @@ msgid "is invalid because there is upstream lock"
msgstr "" msgstr ""
msgid "is not a valid X509 certificate." msgid "is not a valid X509 certificate."
======= msgstr ""
msgid "issue boards" msgid "issue boards"
>>>>>>> upstream/master
msgstr "" msgstr ""
msgid "latest version" msgid "latest version"
......
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