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

fix: crash on diff view open

Browse Source
This commit is contained in:
thecodrr
2022-07-26 12:32:41 +05:00
parent 2b097bb3b6
commit 849d6600d0
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/web/src/components/diff-viewer/index.js
View File

@@ -89,11 +89,6 @@ function DiffViewer(props) {
toKeepDateEdited: content.dateEdited, toKeepDateEdited: content.dateEdited,
}); });
content.conflicted = await db.content.insertPlaceholders(
content.conflicted,
"/placeholder.svg"
);
setConflictedNote(note); setConflictedNote(note);
setLocalContent({ ...content, conflicted: false }); setLocalContent({ ...content, conflicted: false });
setRemoteContent(content.conflicted); setRemoteContent(content.conflicted);