From 93dc34998182b3504145038e9cd3aeecf29e8ba4 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Tue, 5 Feb 2019 14:40:42 -0800 Subject: Resolve conflicts in spec/services/members/destroy_service_spec.rb --- spec/services/members/destroy_service_spec.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/spec/services/members/destroy_service_spec.rb b/spec/services/members/destroy_service_spec.rb index 57bf2606853..d37ca13ebd2 100644 --- a/spec/services/members/destroy_service_spec.rb +++ b/spec/services/members/destroy_service_spec.rb @@ -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 -- cgit v1.2.3