Ubuntu One Client

Code review comment for lp:~nataliabidart/ubuntuone-client/conflict-only-when-needed

  1. conflict-only-when-needed
  2. Merge into trunk
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

> Attempt to merge lp:~nataliabidart/ubuntuone-client/conflict-only-when-needed
> into lp:ubuntuone-client failed due to merge conflicts:
>
> text conflict in tests/syncdaemon/test_fsm.py
> text conflict in ubuntuone/syncdaemon/filesystem_manager.py

Conflicts fixed and merged. Changes pushed.

« Back to merge proposal