Attempt to merge lp:~facundo/ubuntuone-client/stable--query-no-content-file into lp:ubuntuone-client/stable-1-2 failed due to merge conflicts:
text conflict in tests/syncdaemon/test_sync.py
« Back to merge proposal
Attempt to merge lp:~facundo/ubuntuone-client/stable--query-no-content-file into lp:ubuntuone-client/stable-1-2 failed due to merge conflicts:
text conflict in tests/syncdaemo n/test_ sync.py