Skip to content

G
gitlab-ce
Commit e3f322f3 authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve conflict in doc 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 6cce6d2e
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
doc/ci/variables/README.md
View file @ e3f322f3
...@@ -428,7 +428,4 @@ export CI_REGISTRY_PASSWORD="longalfanumstring" ...@@ -428,7 +428,4 @@ export CI_REGISTRY_PASSWORD="longalfanumstring"
[triggers]: ../triggers/README.md#pass-job-variables-to-a-trigger [triggers]: ../triggers/README.md#pass-job-variables-to-a-trigger
[protected branches]: ../../user/project/protected_branches.md [protected branches]: ../../user/project/protected_branches.md
[protected tags]: ../../user/project/protected_tags.md [protected tags]: ../../user/project/protected_tags.md
<<<<<<< HEAD
=======
[shellexecutors]: https://docs.gitlab.com/runner/executors/ [shellexecutors]: https://docs.gitlab.com/runner/executors/
>>>>>>> origin/master
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