Attempt to merge lp:~cmiller/desktopcouch/config-file-clean-up into lp:desktopcouch failed due to merge conflicts:
text conflict in desktopcouch/start_local_couchdb.py
« Back to merge proposal
Attempt to merge lp:~cmiller/desktopcouch/config-file-clean-up into lp:desktopcouch failed due to merge conflicts:
text conflict in desktopcouch/ start_local_ couchdb. py