Resolve qa/qa/page/base.rb

7a7e7d81 · Robert Speicher · 4811eed7 · 7a7e7d81
Commit 7a7e7d81 authored Dec 06, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

qa/qa/page/base.rb qa/qa/page/base.rb +0 -7

No files found.
--- a/qa/qa/page/base.rb
+++ b/qa/qa/page/base.rb
@@ -100,13 +100,6 @@ module QA
        find_element(name).set(content)
      end

-<<<<<<< HEAD
-      def hover_element(name)
-        find_element(name).hover
-      end
-
-=======
->>>>>>> upstream/master
      def select_element(name, value)
        element = find_element(name)