Skip to content

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

core: enable conflicts on locked notes

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