Text conflict in data/CMakeLists.txt Text conflict in debian/control Text conflict in debian/unity8.install Text conflict in qml/Greeter/Clock.qml Text conflict in tests/autopilot/unity8/shell/tests/test_notifications.py 5 conflicts encountered.
« Back to merge proposal
Text conflict in data/CMakeLists.txt unity8. install Clock.qml /unity8/ shell/tests/ test_notificati ons.py
Text conflict in debian/control
Text conflict in debian/
Text conflict in qml/Greeter/
Text conflict in tests/autopilot
5 conflicts encountered.