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

475290a4 · Lin Jen-Shin · 1897a4a6 · 475290a4
Commit 475290a4 authored Jan 31, 2018 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/qa/qa/page/menu/admin.rb
+++ b/qa/qa/page/menu/admin.rb
@@ -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