From 1544b656e0546e8eca5e72e15b419019c7fbd79c Mon Sep 17 00:00:00 2001
From: Abdullah Atta <abdullahatta@streetwriters.co>
Date: Tue, 21 May 2024 12:19:17 +0500
Subject: [PATCH] web: fix conflict on locked note auto resolving

---
 apps/web/src/stores/editor-store.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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) {