diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-02-05 14:40:06 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-02-05 14:40:06 -0800 |
| commit | 6b47a29a7e5e7ee219753ad15e1a119b0f44ee44 (patch) | |
| tree | 6f4334006f8b6b58cb2fddc0071b1580292593c6 /lib/api/files.rb | |
| parent | 3acc82a8d92d6679f6300105f98b9360fd163934 (diff) | |
| download | gitlab-ce-6b47a29a7e5e7ee219753ad15e1a119b0f44ee44.tar.gz | |
Resolve conflicts in spec/policies/personal_snippet_policy_spec.rb
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions