Text conflict in src/platforms/mirserver/miral/CMakeLists.txt Text conflict in src/platforms/mirserver/qmirserver_p.cpp Text conflict in src/platforms/mirserver/wrappedwindowmanagementpolicy.cpp 3 conflicts encountered.
« Back to merge proposal
Text conflict in src/platforms/ mirserver/ miral/CMakeList s.txt mirserver/ qmirserver_ p.cpp mirserver/ wrappedwindowma nagementpolicy. cpp
Text conflict in src/platforms/
Text conflict in src/platforms/
3 conflicts encountered.