Fix conflicts on ci docs

Fix conflicts for ce-to-ee-2018-11-07

doc/ci/variables/README.md

@@ -66,11 +66,7 @@ future GitLab releases.**
 | **CI_JOB_MANUAL**               | 8.12   | all    | The flag to indicate that job was manually started |
 | **CI_JOB_NAME**                 | 9.0    | 0.5    | The name of the job as defined in `.gitlab-ci.yml` |
 | **CI_JOB_STAGE**                | 9.0    | 0.5    | The name of the stage as defined in `.gitlab-ci.yml` |
-<<<<<<< HEAD
 | **CI_JOB_TOKEN**                | 9.0    | 1.2    | Token used for authenticating with [GitLab Container Registry][registry], downloading [dependent repositories][dependent-repositories], authenticate with multi-project pipelines when [triggers][trigger-job-token] are involved, and for [downloading job artifacts][get-job-artifacts]  |
-=======
-| **CI_JOB_TOKEN**                | 9.0    | 1.2    | Token used for authenticating with the [GitLab Container Registry][registry] and downloading [dependent repositories][dependent-repositories] |
->>>>>>> upstream/master
 | **CI_NODE_INDEX**               | 11.5   | all    | Index of the job in the job set. If the job is not parallelized, this variable is not set. |
 | **CI_NODE_TOTAL**               | 11.5   | all    | Total number of instances of this job running in parallel. If the job is not parallelized, this variable is set to `1`. |
 | **CI_JOB_URL**                  | 11.1   | 0.5    | Job details URL |

doc/ci/yaml/README.md

@@ -74,11 +74,7 @@ A job is defined by a list of parameters that define the job behavior.
 | after_script  | no       | Override a set of commands that are executed after job |
 | environment   | no       | Defines a name of environment to which deployment is done by this job |
 | coverage      | no       | Define code coverage settings for a given job |
-<<<<<<< HEAD
-| retry         | no       | Define how many times a job can be auto-retried in case of a failure |
-=======
 | retry         | no       | Define when and how many times a job can be auto-retried in case of a failure |
->>>>>>> upstream/master
 | parallel      | no       | Defines how many instances of a job should be run in parallel |
 
 ### `extends`
@@ -1458,8 +1454,6 @@ test:
   retry: 2
 ```
 
-<<<<<<< HEAD
-=======
 By default, a job will be retried on all failure cases. To have a better control
 on which failures to retry, `retry` can be a hash with with the following keys:
 
@@ -1511,7 +1505,6 @@ Possible values for `when` are:
 - `runner_unsupported`: Retry if the runner was unsupported.
 
 
->>>>>>> upstream/master
 ## `parallel`
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22631) in GitLab 11.5.