Fix conficts in docs

doc/api/README.md

@@ -73,7 +73,6 @@ controller-specific endpoints. GraphQL has a number of benefits:
 
 It will co-exist with the current v4 REST API. If we have a v5 API, this should
 be a compatibility layer on top of GraphQL.
-<<<<<<< HEAD
 
 ## Authentication
 
@@ -83,17 +82,6 @@ for each individual endpoint. For example, the [`/projects/:id` endpoint](projec
 
 There are three types of access tokens available:
 
-=======
-
-## Authentication
-
-Most API requests require authentication via a session cookie or token. For
-those cases where it is not required, this will be mentioned in the documentation
-for each individual endpoint. For example, the [`/projects/:id` endpoint](projects.md).
-
-There are three types of access tokens available:
-
->>>>>>> ce/master
 1. [OAuth2 tokens](#oauth2-tokens)
 1. [Private tokens](#private-tokens)
 1. [Personal access tokens](#personal-access-tokens)

doc/api/projects.md

@@ -348,12 +348,9 @@ Parameters:
 | `lfs_enabled` | boolean | no | Enable LFS |
 | `request_access_enabled` | boolean | no | Allow users to request member access |
 | `tag_list`    | array   | no       | The list of tags for a project; put array of tags, that should be finally assigned to a project |
-<<<<<<< HEAD
+| `avatar`    | mixed   | no      | Image file for avatar of the project                |
 | `repository_storage` | string | no | Which storage shard the repository is on. Available only to admins |
 | `approvals_before_merge` | integer | no | How many approvers should approve merge request by default |
-=======
-| `avatar`    | mixed   | no      | Image file for avatar of the project                |
->>>>>>> ce/master
 
 ### Create project for user
 
@@ -387,12 +384,9 @@ Parameters:
 | `lfs_enabled` | boolean | no | Enable LFS |
 | `request_access_enabled` | boolean | no | Allow users to request member access |
 | `tag_list`    | array   | no       | The list of tags for a project; put array of tags, that should be finally assigned to a project |
-<<<<<<< HEAD
+| `avatar`    | mixed   | no      | Image file for avatar of the project                |
 | `repository_storage` | string | no | Which storage shard the repository is on. Available only to admins |
 | `approvals_before_merge` | integer | no | How many approvers should approve merge request by default |
-=======
-| `avatar`    | mixed   | no      | Image file for avatar of the project                |
->>>>>>> ce/master
 
 ### Edit project
 
@@ -426,12 +420,9 @@ Parameters:
 | `lfs_enabled` | boolean | no | Enable LFS |
 | `request_access_enabled` | boolean | no | Allow users to request member access |
 | `tag_list`    | array   | no       | The list of tags for a project; put array of tags, that should be finally assigned to a project |
-<<<<<<< HEAD
+| `avatar`    | mixed   | no      | Image file for avatar of the project                |
 | `repository_storage` | string | no | Which storage shard the repository is on. Available only to admins |
 | `approvals_before_merge` | integer | no | How many approvers should approve merge request by default |
-=======
-| `avatar`    | mixed   | no      | Image file for avatar of the project                |
->>>>>>> ce/master
 
 ### Fork project
 

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](https://docs.gitlab.com/ee/user/project/merge_requests/code_quality_diff.html).
->>>>>>> ce/master
 
 [cli]: https://github.com/codeclimate/codeclimate
 [dind]: ../docker/using_docker_build.md#use-docker-in-docker-executor