fix qa/specs conflicts

CHANGELOG.md

@@ -275,10 +275,8 @@ entry.
 
 ## 11.1.5 (2018-08-27)
 
-<<<<<<< HEAD
 - No changes.
-=======
->>>>>>> upstream/master
+
 ### Security (3 changes)
 
 - Fixed persistent XSS rendering/escaping of diff location lines.

qa/qa/specs/features/browser_ui/3_create/repository/create_edit_delete_file_via_web_spec.rb

 # frozen_string_literal: true
 
 module QA
-<<<<<<< HEAD
-  context :create do
-=======
   context :create, :core do
->>>>>>> upstream/master
     describe 'Files management' do
       it 'user creates, edits and deletes a file via the Web' do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)

qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb

 # frozen_string_literal: true
 
 module QA
-<<<<<<< HEAD
-  context :verify, :docker do
-=======
   context :verify, :orchestrated, :docker do
->>>>>>> upstream/master
     describe 'Pipeline creation and processing' do
       let(:executor) { "qa-runner-#{Time.now.to_i}" }
 

qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb

@@ -62,22 +62,6 @@ module QA
           end
 
           gitlab_ci = <<~YAML
-<<<<<<< HEAD
-            cat-config:
-              script:
-                - mkdir -p ~/.ssh
-                - ssh-keyscan -p #{@repository_location.port} #{@repository_location.host} >> ~/.ssh/known_hosts
-                - eval $(ssh-agent -s)
-                - ssh-add -D
-                - echo "$#{deploy_key_name}" | ssh-add -
-                - git clone #{@repository_location.git_uri}
-                - cd #{@project.name}
-                - git checkout #{deploy_key_name}
-                - sha1sum .gitlab-ci.yml
-              tags:
-                - qa
-                - docker
-=======
           cat-config:
             script:
               - mkdir -p ~/.ssh
@@ -92,7 +76,6 @@ module QA
             tags:
               - qa
               - docker
->>>>>>> upstream/master
           YAML
 
           Factory::Repository::ProjectPush.fabricate! do |resource|