Commit 475290a4 authored by Lin Jen-Shin's avatar Lin Jen-Shin

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

parent 1897a4a6
......@@ -2,11 +2,8 @@ module QA
module Page
module Menu
class Admin < Page::Base
<<<<<<< HEAD
prepend EE::Page::Menu::Admin
=======
>>>>>>> upstream/master
view 'app/views/layouts/nav/sidebar/_admin.html.haml' do
element :settings, "_('Settings')"
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