scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-09-19 00:01:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix saving of automatically merged remote changes during sync

Browse source
This commit is contained in:
Dan Stillman 2016-07-19 02:27:38 -04:00
parent 2857f85656
commit 66ca2cfda2
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -703,7 +703,7 @@ Zotero.Sync.Data.Local = {
}
jsonDataLocal[x] = jsonData[x];
})
jsonData = jsonDataLocal;
jsonObject.data = jsonDataLocal;
}
}
// Object doesn't exist locally