Attempt to merge into lp:desktopcouch failed due to conflicts:
text conflict in desktopcouch/records/server_base.py
« Back to merge proposal
Attempt to merge into lp:desktopcouch failed due to conflicts:
text conflict in desktopcouch/ records/ server_ base.py