Fix conflicts in docs

doc/ci/variables/README.md

@@ -461,10 +461,7 @@ export CI_REGISTRY_USER="gitlab-ci-token"
 export CI_REGISTRY_PASSWORD="longalfanumstring"
 ```
 
-<<<<<<< HEAD
 [ee-2112]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2112
-=======
->>>>>>> ce/master
 [ce-13784]: https://gitlab.com/gitlab-org/gitlab-ce/issues/13784 "Simple protection of CI secret variables"
 [eep]: https://about.gitlab.com/gitlab-ee/ "Available only in GitLab Enterprise Edition Premium"
 [envs]: ../environments.md

doc/user/project/merge_requests/fast_forward_merge.md

@@ -9,11 +9,7 @@ When the fast-forward merge ([`--ff-only`][ffonly]) setting is enabled, no merge
 commits will be created and all merges are fast-forwarded, which means that
 merging is only allowed if the branch could be fast-forwarded.
 
-<<<<<<< HEAD
-When a fast-forward merge is not possible, the user is given the option to rebase.
-=======
 When a fast-forward merge is not possible, the user must rebase the branch manually.
->>>>>>> ce/master
 
 ## Use cases
 

doc/user/project/merge_requests/index.md

@@ -27,26 +27,13 @@ With GitLab merge requests, you can:
 - [Resolve merge conflicts from the UI](#resolve-conflicts)
 - Enable [fast-forward merge requests](#fast-forward-merge-requests)
 - Enable [semi-linear history merge requests](#semi-linear-history-merge-requests) as another security layer to guarantee the pipeline is passing in the target branch
-<<<<<<< HEAD
 
 With **[GitLab Enterprise Edition][ee]**, you can also:
 
-
 - View the deployment process across projects with [Multi-Project Pipeline Graphs](../../../ci/multi_project_pipeline_graphs.md) (available only in GitLab Enterprise Edition Premium)
 - Request [approvals](#merge-request-approvals) from your managers (available in GitLab Enterprise Edition Starter)
 - [Squash and merge](#squash-and-merge) for a cleaner commit history (available in GitLab Enterprise Edition Starter)
 - Analyze the impact of your changes with [Code Quality reports](#code-quality-reports) (available in GitLab Enterprise Edition Starter)
-=======
-
-
-With **[GitLab Enterprise Edition][ee]**, you can also:
-
-- View the deployment process across projects with [Multi-Project Pipeline Graphs](https://docs.gitlab.com/ee/ci/multi_project_pipeline_graphs.html#multi-project-pipeline-graphs) (available only in GitLab Enterprise Edition Premium)
-- Request [approvals](https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html) from your managers (available in GitLab Enterprise Edition Starter)
-- [Squash and merge](https://docs.gitlab.com/ee/user/project/merge_requests/squash_and_merge.html) for a cleaner commit history (available in GitLab Enterprise Edition Starter)
-- Enable [semi-linear history merge requests](https://docs.gitlab.com/ee/user/project/merge_requests/index.html#semi-linear-history-merge-requests) as another security layer to guarantee the pipeline is passing in the target branch (available in GitLab Enterprise Edition Starter)
-- Analise the impact of your changes with [Code Quality reports](https://docs.gitlab.com/ee/user/project/merge_requests/code_quality_diff.html) (available in GitLab Enterprise Edition Starter)
->>>>>>> ce/master
 
 ## Use cases
 
@@ -338,11 +325,9 @@ 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/master
 [ee]: https://about.gitlab.com/gitlab-ee/ "GitLab Enterprise Edition"

doc/workflow/README.md

@@ -40,12 +40,9 @@
   - [Merge requests versions](../user/project/merge_requests/versions.md)
   - ["Work In Progress" merge requests](../user/project/merge_requests/work_in_progress_merge_requests.md)
   - [Fast-forward merge requests](../user/project/merge_requests/fast_forward_merge.md)
-<<<<<<< HEAD
   - (EE) [Merge request approvals](../user/project/merge_requests/merge_request_approvals.md)
 - (EE) [Repository mirroring](repository_mirroring.md)
 - (EE Premium) [Service Desk](../user/project/service_desk.md)
-=======
->>>>>>> ce/master
 - [Manage large binaries with Git LFS](lfs/manage_large_binaries_with_git_lfs.md)
 - [Importing from SVN, GitHub, Bitbucket, etc](importing/README.md)
 - [Todos](todos.md)