Skip to content

G
gitlab-ce
Commit b48bf854 authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve conflict in qa/qa/page/merge_request/show.rb 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 2b3c6fa7
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
qa/qa/page/merge_request/show.rb
View file @ b48bf854
...@@ -2,11 +2,8 @@ module QA ...@@ -2,11 +2,8 @@ module QA
module Page module Page
module MergeRequest module MergeRequest
class Show < Page::Base class Show < Page::Base
<<<<<<< HEAD
prepend QA::EE::Page::MergeRequest::Show prepend QA::EE::Page::MergeRequest::Show
=======
>>>>>>> upstream/master
view 'app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue' do view 'app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue' do
element :merge_button element :merge_button
element :fast_forward_message, 'Fast-forward merge without a merge commit' element :fast_forward_message, 'Fast-forward merge without a merge commit'
......
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