Commit 412685a6 authored by Phil Hughes's avatar Phil Hughes

Resolve conflicts in gitlab.pot

parent 0848cafe
......@@ -4479,14 +4479,13 @@ msgstr ""
msgid "Identities"
msgstr ""
<<<<<<< HEAD
msgid "Identity provider single sign on URL"
msgstr ""
msgid "If disabled, a diverged local branch will not be automatically updated with commits from its remote counterpart, to prevent local data loss. If the default branch (%{default_branch}) has diverged and cannot be updated, mirroring will fail. Other diverged branches are silently ignored."
=======
msgid "If any job surpasses this timeout threshold, it will be marked as failed. Human readable time input language is accepted like \"1 hour\". Values without specification represent seconds."
>>>>>>> upstream/master
msgstr ""
msgid "If disabled, a diverged local branch will not be automatically updated with commits from its remote counterpart, to prevent local data loss. If the default branch (%{default_branch}) has diverged and cannot be updated, mirroring will fail. Other diverged branches are silently ignored."
msgstr ""
msgid "If disabled, the access level will depend on the user's permissions in the project."
......
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