Btw. just so you guys are aware, there is a 100,- euro bounty open on resolving conflicts. This draft is targetting a generic mechanism to show and resolve conflicts in zim - regardless of the backend (dropbox, bazaar, ...). So far nobody has notified me that they are working on this, so open for the taking ;)
-- Jaap
_______________________________________________ Mailing list: https://launchpad.net/~zim-wiki Post to : zim-wiki@lists.launchpad.net Unsubscribe : https://launchpad.net/~zim-wiki More help : https://help.launchpad.net/ListHelp
