Dan Stillman 196e45c849 Fix file conflict resolution after f0770fa84d ... merge.xul now returns an object with .data and .selected instead of returning .data directly		2017-10-27 04:07:35 -04:00
..
zotero	Fix file conflict resolution after f0770fa84d	2017-10-27 04:07:35 -04:00
zotero-platform	Fix dropmarkers on Linux after 2x upgrades	2017-10-20 18:15:27 -04:00