Attempt to merge lp:~facundo/ubuntuone-client/lr-clean-trash into lp:ubuntuone-client failed due to merge conflicts:
text conflict in ubuntuone/syncdaemon/local_rescan.py
« Back to merge proposal
Attempt to merge lp:~facundo/ubuntuone-client/lr-clean-trash into lp:ubuntuone-client failed due to merge conflicts:
text conflict in ubuntuone/ syncdaemon/ local_rescan. py