> text conflict in desktopcouch/records/tests/test_server.py
Since I can't fix the conflict in this branch directly, I am rejecting this branch, and pushing my own copy of it with the merge conflict resolved.
« Back to merge proposal
> text conflict in desktopcouch/ records/ tests/test_ server. py
Since I can't fix the conflict in this branch directly, I am rejecting this branch, and pushing my own copy of it with the merge conflict resolved.