Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-23 15:09:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

core: add fix for localOnly items getting deleted on sync

Browse Source
This commit is contained in:
Abdullah Atta
2023-09-04 13:14:16 +05:00
committed by Abdullah Atta
parent 12d89114a4
commit aa9cd23cf3
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/src/api/sync/merger.js
View File

@@ -101,6 +101,8 @@ class Merger {
}
async mergeContent(remoteItem, localItem, lastSynced) {
if (localItem && localItem.localOnly) return;
const THRESHOLD = process.env.NODE_ENV === "test" ? 6 * 1000 : 60 * 1000;
const conflicted =
localItem &&