From 9f9e95ea96ff634a5a72d127a58fdad73bec93e5 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 6 Jul 2016 13:56:27 -0400
Subject: [PATCH] Show conflicts in debug output when showing CR window

---
 chrome/content/zotero/xpcom/sync/syncLocal.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/chrome/content/zotero/xpcom/sync/syncLocal.js b/chrome/content/zotero/xpcom/sync/syncLocal.js
index 535b745cf..c05033777 100644
--- 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: {