CE->EE: Fix conflicts in docs

doc/README.md

@@ -51,22 +51,15 @@ Shortcuts to GitLab's most visited docs:
   - [Project access](public_access/public_access.md): Setting up your project's visibility to public, internal, or private.
   - [GitLab Pages](user/project/pages/index.md): Build, test, and deploy your static website with GitLab Pages.
 - [Groups](user/group/index.md): Organize your projects in groups.
-<<<<<<< HEAD
-  - [Subgroups](user/group/subgroups/index.md): nest groups in subgroups.
-=======
   - [Subgroups](user/group/subgroups/index.md)
->>>>>>> ce/master
 - [Search through GitLab](user/search/index.md): Search for issues, merge requests, projects, groups, todos, and issues in Issue Boards.
   - **(EES/EEP)** [Advanced Global Search](user/search/advanced_global_search.md): Leverage Elasticsearch for faster, more advanced code search across your entire GitLab instance.
   - **(EES/EEP)** [Advanced Syntax Search](user/search/advanced_search_syntax.md): Use advanced queries for more targeted search results.
 - [Snippets](user/snippets.md): Snippets allow you to create little bits of code.
 - [Wikis](user/project/wiki/index.md): Enhance your repository documentation with built-in wikis.
-<<<<<<< HEAD
 - [GitLab Pages](user/project/pages/index.md): Build, test, and deploy your static website with GitLab Pages.
 - **(EEP)** [GitLab Service Desk](user/project/service_desk.md): A simple way to allow people to create issues in your GitLab instance without needing their own user account.
 - **(EES/EEP)** [Contribution Analytics](analytics/contribution_analytics.md): See detailed statistics of projects' contributors.
-=======
->>>>>>> ce/master
 
 ### Repository
 

doc/api/users.md

@@ -244,29 +244,6 @@ POST /users
 
 Parameters:
 
-<<<<<<< HEAD
-- `email` (required)            - Email
-- `password` (optional)         - Password
-- `reset_password` (optional)   - Send user password reset link - true or false(default)
-- `username` (required)         - Username
-- `name` (required)             - Name
-- `skype` (optional)            - Skype ID
-- `linkedin` (optional)         - LinkedIn
-- `twitter` (optional)          - Twitter account
-- `website_url` (optional)      - Website URL
-- `organization` (optional)     - Organization name
-- `projects_limit` (optional)   - Number of projects user can create
-- `extern_uid` (optional)       - External UID
-- `provider` (optional)         - External provider name
-- `bio` (optional)              - User's biography
-- `location` (optional)         - User's location
-- `admin` (optional)            - User is admin - true or false (default)
-- `can_create_group` (optional) - User can create groups - true or false
-- `confirm` (optional)          - Require confirmation - true (default) or false
-- `external` (optional)         - Flags the user as external - true or false(default)
-- `shared_runners_minutes_limit` (optional) - Pipeline minutes quota for this user
-- `avatar` (optional)           - Image file for user's avatar
-=======
 - `email` (required)             - Email
 - `password` (optional)          - Password
 - `reset_password` (optional)    - Send user password reset link - true or false(default)
@@ -287,7 +264,7 @@ Parameters:
 - `skip_confirmation` (optional) - Skip confirmation - true or false (default)
 - `external` (optional)          - Flags the user as external - true or false(default)
 - `avatar` (optional)            - Image file for user's avatar
->>>>>>> ce/master
+- `shared_runners_minutes_limit` (optional) - Pipeline minutes quota for this user
 
 ## User modification
 

doc/articles/index.md

@@ -12,11 +12,6 @@ where they were originally published.
 
 ## Authentication
 
-<<<<<<< HEAD
-- **LDAP**
-  - [How to configure LDAP with GitLab CE](how_to_configure_ldap_gitlab_ce/index.md)
-  - [How to configure LDAP with GitLab EE](how_to_configure_ldap_gitlab_ee/index.md)
-=======
 Explore GitLab's supported [authentications methods](../topics/authentication/index.md):
 
 | Article title | Category | Publishing date |
@@ -42,7 +37,6 @@ Build, test, and deploy the software you develop with [GitLab CI/CD](../ci/READM
 | [GitLab Container Registry](https://about.gitlab.com/2016/05/23/gitlab-container-registry/) | Technical overview | 2016/05/23 |
 | [How to use GitLab CI and MacStadium to build your macOS or iOS projects](https://about.gitlab.com/2017/05/15/how-to-use-macstadium-and-gitlab-ci-to-build-your-macos-or-ios-projects/) | Technical overview | 2017/05/15 |
 | [Setting up GitLab CI for iOS projects](https://about.gitlab.com/2016/03/10/setting-up-gitlab-ci-for-ios-projects/) | Tutorial | 2016/03/10 |
->>>>>>> ce/master
 
 ## Git
 

doc/user/project/milestones/index.md

@@ -84,7 +84,6 @@ total merge requests and issues.
 
 ![Milestone statistics](img/progress.png)
 
-<<<<<<< HEAD
 ## Burndown Charts
 
 [Burndown Charts](burndown_charts.md), available in
@@ -95,9 +94,6 @@ are visual representations of the progress of completing a milestone.
 
 Burndown charts are only available for project milestones currently. They will be available for group milestones [in the future](https://gitlab.com/gitlab-org/gitlab-ee/issues/3064).
 
-[Quick actions](../quick_actions.md) are available for assigning and removing project milestones only. [In the future](https://gitlab.com/gitlab-org/gitlab-ce/issues/34778), this will also apply to group milestones.
-=======
 ## Quick actions
 
 [Quick actions](../quick_actions.md) are available for assigning and removing project milestones only. [In the future](https://gitlab.com/gitlab-org/gitlab-ce/issues/34778), this will also apply to group milestones.
->>>>>>> ce/master