OK, tests pass, so I assume the conflict resolution didn't break anything :-)
« Back to merge proposal
OK, tests pass, so I assume the conflict resolution didn't break anything :-)