Attempt to merge into lp:desktopcouch failed due to conflicts:
text conflict in desktopcouch/local_files.py text conflict in desktopcouch/platform/__init__.py
« Back to merge proposal
Attempt to merge into lp:desktopcouch failed due to conflicts:
text conflict in desktopcouch/ local_files. py platform/ __init_ _.py
text conflict in desktopcouch/