core: enable conflicts on locked notes

2026-02-23 19:49:56 +01:00 · 2024-05-21 12:17:50 +05:00
parent f585fb0381
commit d97314c484
1 changed files with 0 additions and 2 deletions
--- 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
    ) {