Skip to content

G
gitlab-ce
Commit 0f43a54f authored by Winnie Hellmann's avatar Winnie Hellmann
Browse files
Options

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

parent 2c4a4ca3
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
qa/qa/page/admin/menu.rb
View file @ 0f43a54f
...@@ -4,11 +4,8 @@ module QA ...@@ -4,11 +4,8 @@ module QA
module Page module Page
module Admin module Admin
class Menu < Page::Base class Menu < Page::Base
<<<<<<< HEAD:qa/qa/page/admin/menu.rb
prepend EE::Page::Admin::Menu prepend EE::Page::Admin::Menu
=======
>>>>>>> upstream/master:qa/qa/page/admin/menu.rb
view 'app/views/layouts/nav/sidebar/_admin.html.haml' do view 'app/views/layouts/nav/sidebar/_admin.html.haml' do
element :admin_sidebar element :admin_sidebar
element :admin_sidebar_submenu element :admin_sidebar_submenu
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7