Resolve conflicts

doc/api/jobs.md

@@ -324,10 +324,7 @@ Example of response
 ## Get job artifacts
 
 > **Notes**:
-<<<<<<< HEAD
-=======
 >
->>>>>>> upstream/master
 > - [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.
@@ -376,10 +373,7 @@ Response:
 ## Download the artifacts archive
 
 > **Notes**:
-<<<<<<< HEAD
-=======
 >
->>>>>>> upstream/master
 > - [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.

doc/user/project/quick_actions.md

@@ -47,7 +47,6 @@ do.
 | `/shrug`                   | Append the comment with `¯\＿(ツ)＿/¯` |
 | <code>/copy_metadata #issue &#124; !merge_request</code> | Copy labels and milestone from other issue or merge request |
 | `/confidential`            | Makes the issue confidential |
-<<<<<<< HEAD
 | `/epic <group&epic | Epic URL>` | Adds an issue to an epic |
 | `/remove_epic`             | Removes an issue from an epic |
 | `/lock`                    | Lock the discussion |
@@ -55,7 +54,3 @@ do.
 
 Note: In GitLab Starter every issue can have more than one assignee, so commands `/assign`, `/unassign` and `/reassign`
 support multiple assignees.
-=======
-| `/lock`                    | Lock the discussion |
-| `/unlock`                  | Unlock the discussion |
->>>>>>> upstream/master

spec/services/quick_actions/interpret_service_spec.rb

@@ -871,7 +871,6 @@ describe QuickActions::InterpretService do
       let(:issuable) { merge_request }
     end
 
-<<<<<<< HEAD
     context 'issuable weights licensed' do
       before do
         stub_licensed_features(issue_weights: true)
@@ -906,8 +905,6 @@ describe QuickActions::InterpretService do
       end
     end
 
-=======
->>>>>>> upstream/master
     context '/todo' do
       let(:content) { '/todo' }