diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-07-10 15:00:13 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-07-10 15:06:20 +0100 |
| commit | 57fc7cd8f35525f772d7c59a2aa45c96467cb882 (patch) | |
| tree | 12123ad5d95b5bd5b3335996cbe398f27d9780c1 /lib/gitlab/conflict | |
| parent | 3d4873fa64c833c71ab7ee274002d854eb93ef96 (diff) | |
| download | gitlab-ce-57fc7cd8f35525f772d7c59a2aa45c96467cb882.tar.gz | |
Make sure ConflictsService does not raise for conflicting submodules
Diffstat (limited to 'lib/gitlab/conflict')
0 files changed, 0 insertions, 0 deletions