Resolve conflicts in job/build API specs

spec/requests/api/jobs_spec.rb

@@ -30,11 +30,8 @@ describe API::Jobs do
     let(:query) { Hash.new }
 
     before do |example|
-<<<<<<< HEAD
       job
 
-=======
->>>>>>> upstream/master
       unless example.metadata[:skip_before_request]
         get api("/projects/#{project.id}/jobs", api_user), query
       end

spec/requests/api/v3/builds_spec.rb

@@ -14,10 +14,8 @@ describe API::V3::Builds do
     let(:query) { '' }
 
     before do |example|
-<<<<<<< HEAD
       build
-=======
->>>>>>> upstream/master
+
       create(:ci_build, :skipped, pipeline: pipeline)
 
       unless example.metadata[:skip_before_request]