Dan Stillman 6456b6f561 Adds partial collection conflict resolution support -- items are auto-merged, and an alert is displayed. Support for collection metadata and collection hierarchy conflicts is forthcoming, and the alert will be fed to a new notifications system.		2008-11-30 19:30:15 +00:00
..
zotero	Adds partial collection conflict resolution support -- items are auto-merged, and an alert is displayed. Support for collection metadata and collection hierarchy conflicts is forthcoming, and the alert will be fed to a new notifications system.	2008-11-30 19:30:15 +00:00
zotero-platform	Initial Zotero 1.5 Megacommit	2008-05-04 08:32:48 +00:00