Resolve doc conflicts

doc/ci/docker/using_docker_images.md

@@ -192,13 +192,6 @@ To configure access for `registry.example.com`, follow these steps:
 
 You can add configuration for as many registries as you want, adding more
 registries to the `"auths"` hash as described above.
-<<<<<<< HEAD
-
-If the repository is private you need to authenticate your GitLab Runner in the
-registry. Learn how to do that on
-[GitLab Runner's documentation][runner-priv-reg].
-=======
->>>>>>> ce/master
 
 ## Accessing the services
 

doc/ci/examples/code_climate.md

@@ -27,11 +27,7 @@ download and analyze the report artifact in JSON format.
 
 For GitLab [Enterprise Edition Starter][ee] users, this information can be automatically
 extracted and shown right in the merge request widget. [Learn more on code quality
-<<<<<<< HEAD
-diffs in merge requests](../../user/project/merge_requests/code_quality_diff.md).
-=======
 diffs in merge requests](http://docs.gitlab.com/ee/user/project/merge_requests/code_quality_diff.md).
->>>>>>> ce/master
 
 [cli]: https://github.com/codeclimate/codeclimate
 [dind]: ../docker/using_docker_build.md#use-docker-in-docker-executor