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

0f43a54f · Winnie Hellmann · 2c4a4ca3 · 0f43a54f
Commit 0f43a54f authored Oct 09, 2018 by Winnie Hellmann
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

qa/qa/page/admin/menu.rb qa/qa/page/admin/menu.rb +0 -3

No files found.
--- a/qa/qa/page/admin/menu.rb
+++ b/qa/qa/page/admin/menu.rb
@@ -4,11 +4,8 @@ module QA
  module Page
    module Admin
      class Menu < Page::Base
-<<<<<<< HEAD:qa/qa/page/admin/menu.rb
        prepend EE::Page::Admin::Menu

-=======
->>>>>>> upstream/master:qa/qa/page/admin/menu.rb
        view 'app/views/layouts/nav/sidebar/_admin.html.haml' do
          element :admin_sidebar
          element :admin_sidebar_submenu