Attempt to merge into lp:desktopcouch failed due to conflicts:
text conflict in desktopcouch/records/tests/test_record.py contents conflict in po/desktopcouch.pot
« Back to merge proposal
Attempt to merge into lp:desktopcouch failed due to conflicts:
text conflict in desktopcouch/ records/ tests/test_ record. py
contents conflict in po/desktopcouch.pot