There are conflicts with latest trunk.
""" Text conflict in src/modules/Unity/Application/CMakeLists.txt Text conflict in src/platforms/mirserver/CMakeLists.txt Text conflict in src/platforms/mirserver/wrappedwindowmanagementpolicy.cpp """
« Back to merge proposal
There are conflicts with latest trunk.
""" Unity/Applicati on/CMakeLists. txt mirserver/ CMakeLists. txt mirserver/ wrappedwindowma nagementpolicy. cpp
Text conflict in src/modules/
Text conflict in src/platforms/
Text conflict in src/platforms/
"""