diff options
| author | Phil Hughes <me@iamphill.com> | 2018-09-10 20:40:38 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-09-11 08:47:51 +0100 |
| commit | ea1f388289ded7b89518076c211f95a3bf1e1d8a (patch) | |
| tree | 727830a2bb444cfcfeace8983a920f70d7d6ec2e /doc/development/documentation | |
| parent | 17ca203290c52ff366b0ecc4de3f4da8eebd4380 (diff) | |
| download | gitlab-ce-ea1f388289ded7b89518076c211f95a3bf1e1d8a.tar.gz | |
Re-enables merge conflicts resolution spec
https://gitlab.com/gitlab-org/gitlab-ce/issues/48034
Diffstat (limited to 'doc/development/documentation')
0 files changed, 0 insertions, 0 deletions