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