fix incorrect markdown

5ebc6142 · Brett Walker · c736944d · 5ebc6142
Commit 5ebc6142 authored Sep 06, 2018 by Brett Walker
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 14 deletions

doc/api/jobs.md doc/api/jobs.md +4 -14

No files found.
--- a/doc/api/jobs.md
+++ b/doc/api/jobs.md
@@ -319,14 +319,9 @@ Example of response
 ## Get job artifacts
 > **Notes**:
-<<<<<<< HEAD
- [Introduced][ce-2893] in GitLab 8.5.
- The use of `CI_JOB_TOKEN` in the artifacts download API was [introduced][ee-2346]
-  in [GitLab Premium][ee] 9.5.
-=======
-> 
 > - [Introduced][ce-2893] in GitLab 8.5.
->>>>>>> upstream/master
+> - The use of `CI_JOB_TOKEN` in the artifacts download API was [introduced][ee-2346]
+>   in [GitLab Premium][ee] 9.5.
 Get job artifacts of a project.
@@ -372,14 +367,9 @@ Response:
 ## Download the artifacts archive
 > **Notes**:
-<<<<<<< HEAD
- [Introduced][ce-5347] in GitLab 8.10.
- The use of `CI_JOB_TOKEN` in the artifacts download API was [introduced][ee-2346]
-  in [GitLab Premium][ee] 9.5.
-=======
-> 
 > - [Introduced][ce-5347] in GitLab 8.10.
->>>>>>> upstream/master
+> - The use of `CI_JOB_TOKEN` in the artifacts download API was [introduced][ee-2346]
+>   in [GitLab Premium][ee] 9.5.
 Download the artifacts archive from the given reference name and job provided the
 job finished successfully.