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 /lib/api/api.rb | |
| parent | 6b47a29a7e5e7ee219753ad15e1a119b0f44ee44 (diff) | |
| download | gitlab-ce-93dc34998182b3504145038e9cd3aeecf29e8ba4.tar.gz | |
Resolve conflicts in spec/services/members/destroy_service_spec.rb
Diffstat (limited to 'lib/api/api.rb')
0 files changed, 0 insertions, 0 deletions