Text conflict in debian/control Text conflict in tests/mocks/CMakeLists.txt Text conflict in tests/mocks/QMenuModel/QDBusActionGroup.qml 3 conflicts encountered.
« Back to merge proposal
Text conflict in debian/control CMakeLists. txt QMenuModel/ QDBusActionGrou p.qml
Text conflict in tests/mocks/
Text conflict in tests/mocks/
3 conflicts encountered.