Attempt to merge into lp:desktopcouch failed due to conflicts:
text conflict in desktopcouch/application/migration/__init__.py
text conflict in desktopcouch/application/server.py
text conflict in desktopcouch/records/database.py
text conflict in desktopcouch/records/tests/test_server.py
Attempt to merge into lp:desktopcouch failed due to conflicts:
text conflict in desktopcouch/ application/ migration/ __init_ _.py application/ server. py records/ database. py records/ tests/test_ server. py
text conflict in desktopcouch/
text conflict in desktopcouch/
text conflict in desktopcouch/