Skip to content

G
gitlab-ce
Commit 475290a4 authored by Lin Jen-Shin's avatar Lin Jen-Shin
Browse files
Options

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

parent 1897a4a6
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
qa/qa/page/menu/admin.rb
View file @ 475290a4
...@@ -2,11 +2,8 @@ module QA ...@@ -2,11 +2,8 @@ module QA
module Page module Page
module Menu module Menu
class Admin < Page::Base class Admin < Page::Base
<<<<<<< HEAD
prepend EE::Page::Menu::Admin prepend EE::Page::Menu::Admin
=======
>>>>>>> upstream/master
view 'app/views/layouts/nav/sidebar/_admin.html.haml' do view 'app/views/layouts/nav/sidebar/_admin.html.haml' do
element :settings, "_('Settings')" element :settings, "_('Settings')"
end end
......
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