1. Trivial text conflict in tests/unit-tests/client/test_mir_connection.cpp
2. The diff is messed up and seems to remove much of the recent multi-monitor additions. Please resolve that and resubmit.
« Back to merge proposal
1. Trivial text conflict in tests/unit- tests/client/ test_mir_ connection. cpp
2. The diff is messed up and seems to remove much of the recent multi-monitor additions. Please resolve that and resubmit.