Text conflict in qml/Greeter/Greeter.qml Text conflict in qml/Greeter/WideView.qml 2 conflicts encountered.
« Back to merge proposal
Text conflict in qml/Greeter/ Greeter. qml WideView. qml
Text conflict in qml/Greeter/
2 conflicts encountered.