Ubuntu One Client

Code review comment for lp:~rodrigo-moya/ubuntuone-client/nautilus-refactor-1

  1. nautilus-refactor-1
  2. Merge into trunk
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

There is some conflict when merging trunk:

Text conflict in libsyncdaemon/syncdaemon-daemon.c
Text conflict in nautilus/ubuntuone-nautilus.c
2 conflicts encountered.

review: Needs Fixing

« Back to merge proposal