Text conflict in debian/control
Text conflict in qml/Shell.qml
Text conflict in tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py
Text conflict in tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py
Text conflict in tests/autopilot/unity8/process_helpers.py
Text conflict in debian/control /unity8/ application_ lifecycle/ tests/test_ application_ lifecycle. py /unity8/ application_ lifecycle/ tests/test_ url_dispatcher. py /unity8/ process_ helpers. py
Text conflict in qml/Shell.qml
Text conflict in tests/autopilot
Text conflict in tests/autopilot
Text conflict in tests/autopilot