Resolve conflict in qa/qa/page/project/show.rb

qa/qa/page/project/show.rb

@@ -7,13 +7,10 @@ module QA
           element :clone_dropdown
           element :clone_options_dropdown, '.clone-options-dropdown'
           element :project_repository_location, 'text_field_tag :project_clone'
-<<<<<<< HEAD
-=======
         end
 
         view 'app/views/projects/_last_push.html.haml' do
           element :create_merge_request
->>>>>>> upstream/master
         end
 
         view 'app/views/projects/_home_panel.html.haml' do
@@ -23,19 +20,11 @@ module QA
         def choose_repository_clone_http
           wait(reload: false) do
             click_element :clone_dropdown
-<<<<<<< HEAD
 
             page.within('.clone-options-dropdown') do
               click_link('HTTP')
             end
 
-=======
-
-            page.within('.clone-options-dropdown') do
-              click_link('HTTP')
-            end
-
->>>>>>> upstream/master
             # Ensure git clone textbox was updated to http URI
             page.has_css?('.git-clone-holder input#project_clone[value*="http"]')
           end