Resolve doc conflicts

doc/ci/autodeploy/index.md

@@ -35,7 +35,6 @@ enable [Kubernetes service][kubernetes-service].
 1. Test your deployment configuration using a [Review App][review-app] that was
 created automatically for you.
 
-<<<<<<< HEAD
 ## Using the Kubernetes deploy example project with Nginx
 
 The Autodeploy templates are based on the [kubernetes-deploy][kube-deploy]
@@ -115,8 +114,6 @@ Next, we replace `__CI_ENVIRONMENT_SLUG__` with the content of the
 Finally, the Nginx pod is created from the definition of the
 `nginx-deployment.yaml` file.
 
-=======
->>>>>>> ce-com/master
 ## Private Project Support
 
 > Experimental support [introduced][mr-2] in GitLab 9.1.
@@ -149,10 +146,7 @@ PostgreSQL provisioning can be disabled by setting the variable `DISABLE_POSTGRE
 [kubernetes-service]: ../../user/project/integrations/kubernetes.md
 [docker-in-docker]: ../docker/using_docker_build.md#use-docker-in-docker-executor
 [review-app]: ../review_apps/index.md
-<<<<<<< HEAD
 [kube-image]: https://gitlab.com/gitlab-examples/kubernetes-deploy/container_registry "Kubernetes deploy Container Registry"
 [kube-deploy]: https://gitlab.com/gitlab-examples/kubernetes-deploy "Kubernetes deploy example project"
-=======
->>>>>>> ce-com/master
 [container-registry]: https://docs.gitlab.com/ce/user/project/container_registry.html
 [postgresql]: https://www.postgresql.org/

doc/university/glossary/README.md

@@ -333,11 +333,7 @@ A [platform](https://www.meteor.com) for building javascript apps.
 
 ### Milestones
 
-<<<<<<< HEAD
-Allow you to [organize issues](https://docs.gitlab.com/ce/user/project/milestones/) and merge requests in GitLab into a cohesive group, optionally setting a due date. A common use is keeping track of an upcoming software version. Milestones are created per-project.
-=======
 Allow you to [organize issues](../../user/project/milestones/index.md) and merge requests in GitLab into a cohesive group, optionally setting a due date. A common use is keeping track of an upcoming software version. Milestones are created per-project.
->>>>>>> ce-com/master
 
 ### Mirror Repositories
 

doc/user/project/merge_requests/index.md

@@ -35,7 +35,6 @@ Resolving comments prevents you from forgetting to address feedback and lets
 you hide discussions that are no longer relevant.
 
 [Read more about resolving discussion comments in merge requests reviews.](../../discussions/index.md)
-<<<<<<< HEAD
 
 ## Squash and merge
 
@@ -43,8 +42,6 @@ GitLab allows you to squash all changes present in a merge request into a single
 commit when merging, to allow for a neater commit history.
 
 [Learn more about squash and merge.](squash_and_merge.md)
-=======
->>>>>>> ce-com/master
 
 ## Resolve conflicts
 

doc/user/project/milestones/index.md

 # Milestones
 
-<<<<<<< HEAD
-Milestones allow you to organize issues and merge requests into a cohesive group, optionally setting a due date.
-A common use is keeping track of an upcoming software version. Milestones are created per-project.
-
-You can find the milestones page under your project's **Issues ➔ Milestones**.
-
-## Creating a milestone
-
-=======
 Milestones allow you to organize issues and merge requests into a cohesive group,
 optionally setting a due date. A common use is keeping track of an upcoming
 software version. Milestones can be created per-project or per-group.
@@ -19,26 +10,19 @@ software version. Milestones can be created per-project or per-group.
 You need [Master permissions](../../permissions.md) in order to create a milestone.
 
 You can find the milestones page under your project's **Issues ➔ Milestones**.
->>>>>>> ce-com/master
 To create a new milestone, simply click the **New milestone** button when in the
 milestones page. A milestone can have a title, a description and start/due dates.
 Once you fill in all the details, hit the **Create milestone** button.
 
-<<<<<<< HEAD
 >**Note:**
 The start/due dates are required if you intend to use [Burndown charts](#burndown-charts).
 
 ![Creating a milestone](img/milestone_create.png)
 
-## Groups and milestones
-=======
-![Creating a milestone](img/milestone_create.png)
-
 ## Creating a group milestone
 
 >**Note:**
 You need [Master permissions](../../permissions.md) in order to create a milestone.
->>>>>>> ce-com/master
 
 You can create a milestone for several projects in the same group simultaneously.
 On the group's **Issues ➔ Milestones** page, you will be able to see the status
@@ -63,7 +47,6 @@ special options available when filtering by milestone:
 * **Started** - show issues or merge requests from any milestone with a start
   date less than today. Note that this can return results from several
   milestones in the same project.
-<<<<<<< HEAD
 
 ## Burndown charts
 
@@ -93,5 +76,3 @@ cumulative value.
 
 [ee-1540]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1540
 [ee]: https://about.gitlab.com/gitlab-ee
-=======
->>>>>>> ce-com/master