Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

web: fix conflict on locked note auto resolving

Abdullah Atta1544b656e054
diff --git a/apps/web/src/stores/editor-store.ts b/apps/web/src/stores/editor-store.ts
index 0c126e780..d10a53da8 100644
--- a/apps/web/src/stores/editor-store.ts
+++ b/apps/web/src/stores/editor-store.ts
@@ -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) {