diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-02-05 14:40:42 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-02-05 14:40:42 -0800 |
| commit | 93dc34998182b3504145038e9cd3aeecf29e8ba4 (patch) | |
| tree | f57c30bc3f64d25b6beb08ab2db984189bbcf82f | |
| parent | 6b47a29a7e5e7ee219753ad15e1a119b0f44ee44 (diff) | |
| download | gitlab-ce-93dc34998182b3504145038e9cd3aeecf29e8ba4.tar.gz | |
Resolve conflicts in spec/services/members/destroy_service_spec.rb
| -rw-r--r-- | spec/services/members/destroy_service_spec.rb | 4 |
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 |