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

All: Utilities to create and encrypt master keys

Browse Source
This commit is contained in:
Laurent Cozic
2017-12-12 18:41:02 +00:00
parent e44975622a
commit 9bce52a92a
3 changed files with 74 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ReactNativeClient/lib/synchronizer.js
View File

@@ -323,6 +323,11 @@ class Synchronizer {
} else if (action == 'itemConflict') {
// ------------------------------------------------------------------------------
// For non-note conflicts, we take the remote version (i.e. the version that was
// synced first) and overwrite the local content.
// ------------------------------------------------------------------------------
if (remote) {
local = remoteContent;