fix delta resolving

2025-12-22 22:49:45 +01:00 · 2020-04-07 10:22:17 +05:00
parent e66913eaa4
commit dec9a9c192
1 changed files with 8 additions and 2 deletions
--- a/apps/mobile/src/components/MergeEditor/index.js
+++ b/apps/mobile/src/components/MergeEditor/index.js
@@ -147,7 +147,10 @@ const MergeEditor = () => {
      await db.notes.add({
        content: {
          text: primaryText,
-          delta: primaryDelta,
+          delta: {
+            data: primaryDelta,
+            resolved: true
+          },
        },
        id: note.id,
        conflicted: false,
@@ -156,7 +159,10 @@ const MergeEditor = () => {
      await db.notes.add({
        content: {
          text: secondaryText,
-          delta: secondaryDelta,
+          delta: {
+            data: primaryDelta,
+            resolved: true
+          },
        },
        id: note.id,
        conflicted: false,