fix merge editor always saving same note

2025-12-23 06:59:31 +01:00 · 2021-01-30 10:56:53 +05:00
parent d1f2a29dac
commit 85e2ff66aa
1 changed files with 2 additions and 2 deletions
--- a/apps/mobile/src/components/MergeEditor/index.js
+++ b/apps/mobile/src/components/MergeEditor/index.js
@@ -173,8 +173,8 @@ const MergeEditor = () => {
    } else if (keepContentFrom === 'secondary') {
      await db.notes.add({
        content: {
-          data: primaryData.data,
-          type: primaryData.type,
+          data: secondaryData.data,
+          type: secondaryData.type,
          resolved: true,
        },
        id: note.id,