Skip to content

G
gitlab-ce
Commit 436c1881 authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files
Options

Fix conflicts for locale/gitlab.pot

parent b5936931
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
locale/gitlab.pot
View file @ 436c1881
...@@ -3921,11 +3921,10 @@ msgstr "" ...@@ -3921,11 +3921,10 @@ msgstr ""
msgid "Group Runners" msgid "Group Runners"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Group SAML must be enabled to test" msgid "Group SAML must be enabled to test"
======= msgstr ""
msgid "Group URL" msgid "Group URL"
>>>>>>> upstream/master
msgstr "" msgstr ""
msgid "Group avatar" msgid "Group avatar"
......
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