Attempt to merge into lp:unity-2d failed due to conflicts:
text conflict in tests/manual-tests/launcher.txt
« Back to merge proposal
Attempt to merge into lp:unity-2d failed due to conflicts:
text conflict in tests/manual- tests/launcher. txt