Resolve conflicts in the CI YAML README

1c05322f · Grzegorz Bizon · cb1b0fc6 · 1c05322f
Commit 1c05322f authored Sep 06, 2018 by Grzegorz Bizon
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

doc/ci/yaml/README.md doc/ci/yaml/README.md +0 -3

No files found.
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -149,11 +149,8 @@ spinach:
  script: rake spinach
 ```

-<<<<<<< HEAD
 `extends` works across configuration files combined with [`include`](#include).

-=======
->>>>>>> upstream/master
 ### `pages`

 `pages` is a special job that is used to upload static content to GitLab that