Skip to content

G
gitlab-ce
Commit 194f1f88 authored by Grzegorz Bizon's avatar Grzegorz Bizon
Browse files
Options

Resolve conflicts in gitlab.pot

parent c4ccb91b
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 7 deletions
locale/gitlab.pot
View file @ 194f1f88
...@@ -6480,11 +6480,7 @@ msgstr "" ...@@ -6480,11 +6480,7 @@ msgstr ""
msgid "Runners can be placed on separate users, servers, even on your local machine." msgid "Runners can be placed on separate users, servers, even on your local machine."
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Runners currently online: %{active_runners_cnt}"
=======
msgid "Runners currently online: %{active_runners_count}" msgid "Runners currently online: %{active_runners_count}"
>>>>>>> upstream/master
msgstr "" msgstr ""
msgid "Runners page" msgid "Runners page"
...@@ -8129,12 +8125,9 @@ msgstr "" ...@@ -8129,12 +8125,9 @@ msgstr ""
msgid "Version" msgid "Version"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "View epics list" msgid "View epics list"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "View file @ " msgid "View file @ "
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