www

commit 9f9e95ea96ff634a5a72d127a58fdad73bec93e5
parent bfbac246675f920764be6d1d8cb86cc30bb19afc
Author: Dan Stillman <dstillman@zotero.org>
Date:   Wed,  6 Jul 2016 13:56:27 -0400

Show conflicts in debug output when showing CR window

Diffstat:
M
chrome/content/zotero/xpcom/sync/syncLocal.js
 | 
1
+

1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/chrome/content/zotero/xpcom/sync/syncLocal.js b/chrome/content/zotero/xpcom/sync/syncLocal.js
@@ -1064,6 +1064,7 @@ Zotero.Sync.Data.Local = {
 	
 	showConflictResolutionWindow: function (conflicts) {
 		Zotero.debug("Showing conflict resolution window");
+		Zotero.debug(conflicts);
 		
 		var io = {
 			dataIn: {