mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Show conflicts in debug output when showing CR window

Browse source
This commit is contained in:
Dan Stillman 2016-07-06 13:56:27 -04:00
parent bfbac24667
commit 9f9e95ea96
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
chrome/content/zotero/xpcom/sync/syncLocal.js
View file

@ -1064,6 +1064,7 @@ Zotero.Sync.Data.Local = {
showConflictResolutionWindow: function (conflicts) {
Zotero.debug("Showing conflict resolution window");
Zotero.debug(conflicts);
var io = {
dataIn: {