Resolve qa/qa/page/menu/admin.rb

qa/qa/page/menu/admin.rb

@@ -9,7 +9,6 @@ module QA
           element :admin_sidebar_submenu
           element :admin_settings_item
           element :admin_settings_repository_item
-<<<<<<< HEAD
         end
 
         def go_to_repository_settings
@@ -37,35 +36,6 @@ module QA
           end
         end
 
-=======
-        end
-
-        def go_to_repository_settings
-          hover_settings do
-            within_submenu do
-              click_element :admin_settings_repository_item
-            end
-          end
-        end
-
-        private
-
-        def hover_settings
-          within_sidebar do
-            scroll_to_element(:admin_settings_item)
-            find_element(:admin_settings_item).hover
-
-            yield
-          end
-        end
-
-        def within_sidebar
-          within_element(:admin_sidebar) do
-            yield
-          end
-        end
-
->>>>>>> upstream/master
         def within_submenu
           within_element(:admin_sidebar_submenu) do
             yield