Skip to content

G
gitlab-ce
Commit 1c05322f authored by Grzegorz Bizon's avatar Grzegorz Bizon
Browse files
Options

Resolve conflicts in the CI YAML README

parent cb1b0fc6
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
doc/ci/yaml/README.md
View file @ 1c05322f
...@@ -149,11 +149,8 @@ spinach: ...@@ -149,11 +149,8 @@ spinach:
script: rake spinach script: rake spinach
``` ```
<<<<<<< HEAD
`extends` works across configuration files combined with [`include`](#include). `extends` works across configuration files combined with [`include`](#include).
=======
>>>>>>> upstream/master
### `pages` ### `pages`
`pages` is a special job that is used to upload static content to GitLab that `pages` is a special job that is used to upload static content to GitLab that
......
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