Note: was already top approved
Text conflict in qml/Panel/Panel.qml Text conflict in qml/Stages/DesktopStage.qml Text conflict in tests/qmltests/Stages/tst_DesktopStage.qml 3 conflicts encountered.
« Back to merge proposal
Note: was already top approved
Text conflict in qml/Panel/Panel.qml DesktopStage. qml Stages/ tst_DesktopStag e.qml
Text conflict in qml/Stages/
Text conflict in tests/qmltests/
3 conflicts encountered.