Resolve conflict in doc/api/jobs.md

Signed-off-by: Rémy Coutable <remy@rymai.me>

doc/api/jobs.md

@@ -296,11 +296,8 @@ Example of response
 
 > **Notes**:
 - [Introduced][ce-2893] in GitLab 8.5.
-<<<<<<< HEAD
 - The use of `CI_JOB_TOKEN` in the artifacts download API was [introduced][ee-2346]
   in [GitLab Premium][ee] 9.5.
-=======
->>>>>>> upstream/master
 
 Get job artifacts of a project.
 
@@ -316,7 +313,6 @@ GET /projects/:id/jobs/:job_id/artifacts
 
 Example requests:
 
-<<<<<<< HEAD
 - Using the `PRIVATE-TOKEN` header:
 
     ```
@@ -334,11 +330,6 @@ Example requests:
     ```
     curl --location --header --form "job-token=$CI_JOB_TOKEN" "https://gitlab.example.com/api/v4/projects/1/jobs/8/artifacts"
     ```
-=======
-```
-curl --location --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v4/projects/1/jobs/8/artifacts"
-```
->>>>>>> upstream/master
 
 Response:
 
@@ -353,11 +344,8 @@ Response:
 
 > **Notes**:
 - [Introduced][ce-5347] in GitLab 8.10.
-<<<<<<< HEAD
 - The use of `CI_JOB_TOKEN` in the artifacts download API was [introduced][ee-2346]
   in [GitLab Premium][ee] 9.5.
-=======
->>>>>>> upstream/master
 
 Download the artifacts archive from the given reference name and job provided the
 job finished successfully.