Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-23 06:59:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix delta resolving

Browse Source
This commit is contained in:
ammarahm-ed
2020-04-07 10:22:17 +05:00
parent e66913eaa4
commit dec9a9c192
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/mobile/src/components/MergeEditor/index.js
View File

@@ -147,7 +147,10 @@ const MergeEditor = () => {
await db.notes.add({ await db.notes.add({
content: { content: {
text: primaryText, text: primaryText,
delta: primaryDelta, delta: {
data: primaryDelta,
resolved: true
},
}, },
id: note.id, id: note.id,
conflicted: false, conflicted: false,
@@ -156,7 +159,10 @@ const MergeEditor = () => {
await db.notes.add({ await db.notes.add({
content: { content: {
text: secondaryText, text: secondaryText,
delta: secondaryDelta, delta: {
data: primaryDelta,
resolved: true
},
}, },
id: note.id, id: note.id,
conflicted: false, conflicted: false,