www

commit 66ca2cfda2f0e172200d3198d20032f36dfe282a
parent 2857f8565655647c45cb042051aae4bb543ab373
Author: Dan Stillman <dstillman@zotero.org>
Date:   Tue, 19 Jul 2016 02:27:38 -0400

Fix saving of automatically merged remote changes during sync

Diffstat:
M
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
@@ -703,7 +703,7 @@ Zotero.Sync.Data.Local = {
 									}
 									jsonDataLocal[x] = jsonData[x];
 								})
-								jsonData = jsonDataLocal;
+								jsonObject.data = jsonDataLocal;
 							}
 						}
 						// Object doesn't exist locally