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