self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-16 00:14:34 +02:00
Code Issues Releases Activity

Desktop: Fixes #10737: Fix Fix editing notes in "Conflicts" causes them to temporarily vanish (#10913)

Browse Source
This commit is contained in:
Henry Heino
2024-08-22 13:53:39 -07:00
committed by GitHub
parent 02bdb7a79c
commit 33599324d6
4 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/app-desktop/gui/NoteEditor/utils/useFormNote.ts
View File

@ -101,6 +101,7 @@ export default function useFormNote(dependencies: HookDependencies) {
is_todo: n.is_todo,
parent_id: n.parent_id,
deleted_time: n.deleted_time,
is_conflict: n.is_conflict,
bodyWillChangeId: 0,
bodyChangeId: 0,
markup_language: n.markup_language,