Getting merge conflicts with latest trunk now:
Text conflict in debian/control Text conflict in qml/Panel/Panel.qml
« Back to merge proposal
Getting merge conflicts with latest trunk now:
Text conflict in debian/control
Text conflict in qml/Panel/Panel.qml