Should be ok now.
> Attempt to merge lp:~mandel/desktopcouch/batch_update into lp:desktopcouch > failed due to merge conflicts: > > text conflict in desktopcouch/records/server_base.py
« Back to merge proposal
Should be ok now.
> Attempt to merge lp:~mandel/desktopcouch/batch_update into lp:desktopcouch records/ server_ base.py
> failed due to merge conflicts:
>
> text conflict in desktopcouch/