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