Dan Stillman 295e9f3ecf Don't retry cancelled conflicts immediately ... If other items were saved in the same batch, the conflict resolution window could reappear immediately after cancelling it.		2016-04-27 05:45:35 -04:00
..
zotero	Don't retry cancelled conflicts immediately	2016-04-27 05:45:35 -04:00
zotero-platform	Merge branch '4.0'	2016-04-12 16:09:10 -04:00