Resolve docs conflicts

doc/administration/index.md

@@ -47,11 +47,8 @@ Learn how to install, configure, update, and maintain your GitLab instance.
 [source installations](../install/installation.md#installation-from-source).
 - [Environment variables](environment_variables.md): Supported environment variables that can be used to override their defaults values in order to configure GitLab.
 - [Plugins](plugins.md): With custom plugins, GitLab administrators can introduce custom integrations without modifying GitLab's source code.
-<<<<<<< HEAD
 - **(Starter/Premium)** [Elasticsearch](../integration/elasticsearch.md): Enable Elasticsearch to empower GitLab's Advanced Global Search. Useful when you deal with a huge amount of data.
 - **(Premium)** [External Classification Policy Authorization](../user/admin_area/settings/external_authorization.md)
-=======
->>>>>>> upstream/master
 
 #### Customizing GitLab's appearance
 

doc/ci/variables/README.md

@@ -570,7 +570,6 @@ You can find a full list of unsupported variables below:
 
 These variables are also not supported in a contex of a
 [dynamic environment name][dynamic-environments].
-<<<<<<< HEAD
 
 ### Secret variables with an environment scope
 
@@ -590,8 +589,6 @@ my-job:
     variables:
       - $STAGING_SECRET == 'something'
 ```
-=======
->>>>>>> upstream/master
 
 [ee-2112]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2112
 [ce-13784]: https://gitlab.com/gitlab-org/gitlab-ce/issues/13784 "Simple protection of CI secret variables"
@@ -606,7 +603,4 @@ my-job:
 [subgroups]: ../../user/group/subgroups/index.md
 [builds-policies]: ../yaml/README.md#only-and-except-complex
 [dynamic-environments]: ../environments.md#dynamic-environments
-<<<<<<< HEAD
 [trigger-job-token]: ../triggers/README.md#ci-job-token
-=======
->>>>>>> upstream/master

doc/ci/yaml/README.md

@@ -1713,8 +1713,5 @@ CI with various languages.
 [ce-12909]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12909
 [schedules]: ../../user/project/pipelines/schedules.md
 [variables-expressions]: ../variables/README.md#variables-expressions
-<<<<<<< HEAD
 [ee]: https://about.gitlab.com/gitlab-ee/
 [gitlab-versions]: https://about.gitlab.com/products/
-=======
->>>>>>> upstream/master