Resolve conflicts in a scope of CE-EE merge

app/views/groups/_group_admin_settings.html.haml

@@ -10,11 +10,8 @@
         %br/
         %span.descr This setting can be overridden in each project.
 
-<<<<<<< HEAD
 = render partial: 'groups/ee/project_creation_level', locals: { form: f, group: @group }
 
-=======
->>>>>>> upstream/master
 .form-group
   = f.label :require_two_factor_authentication, 'Two-factor authentication', class: 'control-label col-sm-2'
   .col-sm-10

spec/requests/api/runner_spec.rb

@@ -1331,11 +1331,7 @@ describe API::Runner do
               end
 
               it 'download artifacts' do
-<<<<<<< HEAD
                 expect(response).to have_gitlab_http_status(200)
-=======
-                expect(response).to have_http_status(200)
->>>>>>> upstream/master
                 expect(response.headers.to_h).to include download_headers
               end
             end