Resolve conflicts on qa/qa/page/merge_request/show.rb

61bef6de · Felipe Artur · f28d1e38 · 61bef6de
Commit 61bef6de authored Feb 26, 2018 by Felipe Artur
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

qa/qa/page/merge_request/show.rb qa/qa/page/merge_request/show.rb +0 -3

No files found.
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -2,11 +2,8 @@ module QA
  module Page
    module MergeRequest
      class Show < Page::Base
-<<<<<<< HEAD
        prepend QA::EE::Page::MergeRequest::Show

-=======
->>>>>>> upstream/master
        view 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js' do
          element :merge_button
        end