summaryrefslogtreecommitdiff
path: root/spec/services/members/destroy_service_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/services/members/destroy_service_spec.rb')
-rw-r--r--spec/services/members/destroy_service_spec.rb4
1 files changed, 0 insertions, 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