> Attempt to merge lp:~nataliabidart/ubuntuone-client/remove-asserts into lp > :ubuntuone-client failed due to merge conflicts: > > text conflict in tests/syncdaemon/test_localrescan.py
Conflicts resolved! Thanks.
« Back to merge proposal
> Attempt to merge lp:~nataliabidart/ubuntuone-client/remove-asserts into lp n/test_ localrescan. py
> :ubuntuone-client failed due to merge conflicts:
>
> text conflict in tests/syncdaemo
Conflicts resolved! Thanks.