Skip to content

Re-enables merge conflicts resolution spec

Phil Hughes requested to merge mr-conflict-specs-enable into master

What does this MR do?

Re-enables the merge request conflicts resolution spec. This was disabled in during the refactor of the merge request page.

What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ce/issues/48034

Does this MR meet the acceptance criteria?

Merge request reports