Dan Stillman f0770fa84d Fix various conflict resolution bugs ... Among other things, when choosing the local side for a conflict, the remote version could still end up being saved.		2017-10-27 01:08:38 -04:00
..
zotero	Fix various conflict resolution bugs	2017-10-27 01:08:38 -04:00
zotero-platform	Fix dropmarkers on Linux after 2x upgrades	2017-10-20 18:15:27 -04:00