Dan Stillman d5b2f67afa Automatically resolve item deletion/trash conflicts ... If the item was deleted on one side and moved to the trash on the other, just delete the item on the trash side. Since trash emptying happens automatically, this would otherwise result in a conflict even if the user carefully avoided making changes before a manual sync.		2016-07-30 23:03:30 -04:00
..
content	Automatically resolve item deletion/trash conflicts	2016-07-30 23:03:30 -04:00
locale	Prompt to reset library data/files on loss of write access	2016-07-19 19:05:17 -04:00
skin/default/zotero	Fix error on CR of child note, and show parent item title in merge pane	2016-07-07 05:18:02 -04:00