Code review comment for lp:~mzanetti/unity8/inputinfo

Text conflict in plugins/Unity/Launcher/CMakeLists.txt
Text conflict in plugins/Utils/plugin.cpp
Text conflict in qml/CMakeLists.txt
Text conflict in qml/Shell.qml
Text conflict in qml/Stages/PhoneStage.qml
Text conflict in qml/Stages/SessionContainer.qml
Text conflict in qml/Stages/SpreadDelegate.qml
Text conflict in qml/Stages/TabletStage.qml
Text conflict in tests/mocks/Unity/Application/MirSurfaceItem.qml
Text conflict in tests/plugins/Unity/Launcher/CMakeLists.txt
Text conflict in tests/qmltests/CMakeLists.txt
Text conflict in tests/qmltests/Stages/tst_SessionContainer.qml
Text conflict in tests/qmltests/Stages/tst_TabletStage.qml
Text conflict in tests/qmltests/tst_Shell.qml