> Text conflict in tests/qmltests/tst_Shell.qml > 1 conflicts encountered.
Fixed.
« Back to merge proposal
> Text conflict in tests/qmltests/ tst_Shell. qml
> 1 conflicts encountered.
Fixed.