Text conflict in qml/Greeter/LoginList.qml Text conflict in qml/Greeter/NarrowView.qml Text conflict in qml/Greeter/WideView.qml Text conflict in tests/qmltests/Greeter/tst_WideView.qml 4 conflicts encountered.
« Back to merge proposal
Text conflict in qml/Greeter/ LoginList. qml NarrowView. qml WideView. qml Greeter/ tst_WideView. qml
Text conflict in qml/Greeter/
Text conflict in qml/Greeter/
Text conflict in tests/qmltests/
4 conflicts encountered.