Attempt to merge into lp:ubuntuone-control-panel failed due to conflicts:
text conflict in ubuntuone/controlpanel/gtk/gui.py
« Back to merge proposal
Attempt to merge into lp:ubuntuone-control-panel failed due to conflicts:
text conflict in ubuntuone/ controlpanel/ gtk/gui. py