Text conflict in debian/control Text conflict in plugins/Utils/windowstatestorage.cpp Text conflict in qml/OrientedShell.qml 3 conflicts encountered.
« Back to merge proposal
Text conflict in debian/control Utils/windowsta testorage. cpp ll.qml
Text conflict in plugins/
Text conflict in qml/OrientedShe
3 conflicts encountered.