fix missing conflict in doc/..../merge_requests/index.md

0606dae5 · Marcia Ramos · 57c71991 · 0606dae5
Commit 0606dae5 authored Jul 17, 2017 by Marcia Ramos
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

doc/user/project/merge_requests/index.md doc/user/project/merge_requests/index.md +0 -3

No files found.
--- a/doc/user/project/merge_requests/index.md
+++ b/doc/user/project/merge_requests/index.md
@@ -288,11 +288,8 @@ git checkout origin/merge-requests/1
 ```

 [protected branches]: ../protected_branches.md
-<<<<<<< HEAD
 [products]: https://about.gitlab.com/products/ "GitLab products page"
 [ci]: ../../../ci/README.md
 [cc]: https://codeclimate.com/
 [cd]: https://hub.docker.com/r/codeclimate/codeclimate/
-=======
->>>>>>> ce-com/master
 [ee]: https://about.gitlab.com/gitlab-ee/ "GitLab Enterprise Edition"