Text conflict in qml/Stages/PhoneStage.qml Text conflict in qml/Stages/TabletStage.qml 2 conflicts encountered.
« Back to merge proposal
Text conflict in qml/Stages/ PhoneStage. qml TabletStage. qml
Text conflict in qml/Stages/
2 conflicts encountered.