> Text conflict in src/platforms/mirserver/qmirserver_p.cpp > 1 conflicts encountered. > > Was already top approved.
Fixed.
« Back to merge proposal
> Text conflict in src/platforms/ mirserver/ qmirserver_ p.cpp
> 1 conflicts encountered.
>
> Was already top approved.
Fixed.