Skip to content

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

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

parent d5e5eb1d
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
qa/qa/page/menu/admin.rb
View file @ 7772e890
...@@ -2,13 +2,10 @@ module QA ...@@ -2,13 +2,10 @@ module QA
module Page module Page
module Menu module Menu
class Admin < Page::Base class Admin < Page::Base
<<<<<<< HEAD:qa/qa/page/menu/admin.rb
def go_to_geo_nodes def go_to_geo_nodes
click_link 'Geo Nodes' click_link 'Geo Nodes'
end end
=======
>>>>>>> upstream/master:qa/qa/page/menu/admin.rb
def go_to_license def go_to_license
click_link 'License' click_link 'License'
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