Code review comment for lp:~nataliabidart/ubuntuone-client/remove-asserts

Revision history for this message
Natalia Bidart (nataliabidart) wrote :

> 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