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

Improve sync conflict handling when the changes between local and remote don't matter

Browse Source
This commit is contained in:
Laurent Cozic
2017-11-02 22:48:17 +00:00
parent 8b454e1e95
commit 742cff5598
7 changed files with 88 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CliClient/app/command-edit.js
View File

@@ -75,7 +75,7 @@ class Command extends BaseCommand {
this.logger().info('Disabling fullscreen...');
app().gui().showModalOverlay(_('Starting to edit note. Close the editor to get back to the prompt.'));
app().gui().forceRender();
await app().gui().forceRender();
const termState = app().gui().term().saveState();
const spawnSync = require('child_process').spawnSync;