Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2026-02-23 19:49:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

web: fix conflict on locked note auto resolving

Browse Source
This commit is contained in:
Abdullah Atta
2024-05-21 12:19:17 +05:00
committed by 01zulfi
parent d97314c484
commit 1544b656e0
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/web/src/stores/editor-store.ts
View File

@@ -750,12 +750,7 @@ class EditorStore extends BaseStore<EditorStore> {
? await db.content.get(note.contentId)
: undefined;
if (
!content ||
content.locked ||
!content.conflicted ||
note.type === "trash"
) {
if (!content || !content.conflicted || note.type === "trash") {
note.conflicted = false;
await db.notes.add({ id: note.id, conflicted: false });
if (content?.locked) {