Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-21 22:19:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: add merge conflict handling

Browse Source
This commit is contained in:
thecodrr
2020-03-29 19:20:12 +05:00
parent d76709fe1e
commit defa827e4d
2 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/core/collections/notes.js
View File

@@ -105,7 +105,8 @@ export default class Notes {
tags: note.tags || [],
favorite: !!note.favorite,
headline: note.headline,
dateCreated: note.dateCreated
dateCreated: note.dateCreated,
conflicted: !!note.conflicted
};
if (!oldNote) {