Dan Stillman f482f65a46 - Fix some causes of "Source item for keyed source doesn't exist" ... - If a child item is in conflict, always keep parent item if one side has one regardless of which side is chosen - On cancelling sync from CR window, don't continue with file sync - Clarify "Background sync resulted in conflict" message - Display the error icon rather than the warning icon on errors (though some file sync problems should be changed to warnings instead)		2009-09-28 06:39:54 +00:00
..
zotero	- Fix some causes of "Source item for keyed source doesn't exist"	2009-09-28 06:39:54 +00:00