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
..
components	Increase default test timeout to 10 seconds on Travis	2016-04-26 02:43:44 -04:00
content	Allow additional options for support test functions	2016-07-19 18:54:37 -04:00
resource	Gzip-compress API uploads larger than 1000 characters	2016-03-28 02:38:28 -04:00
tests	Automatically resolve item deletion/trash conflicts	2016-07-30 23:03:30 -04:00
chrome.manifest	Unit testing infrastructure	2015-03-07 16:34:55 -05:00
install.rdf	Update maxVersion	2015-10-29 03:57:08 -04:00
runtests.sh	Set Zotero.automatedTest flag instead of .noUserInput on Travis	2016-06-24 18:28:32 -04:00