Commit 93dc3499 authored by Stan Hu's avatar Stan Hu

Resolve conflicts in spec/services/members/destroy_service_spec.rb

parent 6b47a29a
Pipeline #46291222 passed with stages
in 110 minutes and 38 seconds
......@@ -168,11 +168,7 @@ describe Members::DestroyService do
end
it_behaves_like 'a service destroying a member' do
<<<<<<< HEAD
let(:opts) { { skip_authorization: true, skip_subresources: true } }
=======
let(:opts) { { skip_authorization: true, skip_subresources: true } }
>>>>>>> dev/master
let(:member) { group.requesters.find_by(user_id: member_user.id) }
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