self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-29 22:48:10 +02:00
Code Issues Releases Activity

Desktop,Mobile: Resolves #10073, #10080: Fix conflicts notebook doesn't work with the trash feature (#10104)

Browse Source
This commit is contained in:
Henry Heino
2024-03-14 11:30:49 -07:00
committed by GitHub
parent 8eea3953f3
commit c16ce1c434
16 changed files with 193 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/lib/models/utils/getConflictFolderId.ts Normal file
View File

@@ -0,0 +1,2 @@
export default () => 'c04f1c7c04f1c7c04f1c7c04f1c7c04f';