Text conflict in tests/qmltests/Dash/tst_Dash.qml Text conflict in tests/qmltests/Dash/tst_DashContent.qml Text conflict in tests/qmltests/Dash/tst_DashShell.qml 3 conflicts encountered.
« Back to merge proposal
Text conflict in tests/qmltests/ Dash/tst_ Dash.qml Dash/tst_ DashContent. qml Dash/tst_ DashShell. qml
Text conflict in tests/qmltests/
Text conflict in tests/qmltests/
3 conflicts encountered.