From 66ca2cfda2f0e172200d3198d20032f36dfe282a Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 19 Jul 2016 02:27:38 -0400 Subject: [PATCH] Fix saving of automatically merged remote changes during sync --- chrome/content/zotero/xpcom/sync/syncLocal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/sync/syncLocal.js b/chrome/content/zotero/xpcom/sync/syncLocal.js index 52b568169d..f71716e9c9 100644 --- a/chrome/content/zotero/xpcom/sync/syncLocal.js +++ b/chrome/content/zotero/xpcom/sync/syncLocal.js @@ -703,7 +703,7 @@ Zotero.Sync.Data.Local = { } jsonDataLocal[x] = jsonData[x]; }) - jsonData = jsonDataLocal; + jsonObject.data = jsonDataLocal; } } // Object doesn't exist locally