From d97314c4847ed0ccd6215a7ff4d8d9b200d9ca6b Mon Sep 17 00:00:00 2001
From: Abdullah Atta <abdullahatta@streetwriters.co>
Date: Tue, 21 May 2024 12:17:50 +0500
Subject: [PATCH] core: enable conflicts on locked notes

---
 packages/core/src/api/sync/merger.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/core/src/api/sync/merger.ts b/packages/core/src/api/sync/merger.ts
index aefbe4f79..e56b5c171 100644
--- a/packages/core/src/api/sync/merger.ts
+++ b/packages/core/src/api/sync/merger.ts
@@ -59,8 +59,6 @@ class Merger {
       isDeleted(remoteItem) ||
       remoteItem.type !== "tiptap" ||
       localItem.type !== "tiptap" ||
-      localItem.locked ||
-      remoteItem.locked ||
       !localItem.data ||
       !remoteItem.data
     ) {