> Text conflict in tests/qmltests/Launcher/tst_Launcher.qml > 1 conflicts encountered. > > Note: Was top approved already.
Done.
« Back to merge proposal
> Text conflict in tests/qmltests/ Launcher/ tst_Launcher. qml
> 1 conflicts encountered.
>
> Note: Was top approved already.
Done.