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

feat: recalculate conflicts on sync

Browse Source
This commit is contained in:
thecodrr
2020-04-04 13:29:33 +05:00
parent 10ee35a145
commit 4dc3d2fe44
4 changed files with 65 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/api/index.js
View File

@@ -7,6 +7,7 @@ import Sync from "./sync";
import Vault from "./vault";
import Lookup from "./lookup";
import Content from "../collections/content";
import Conflict from "./conflicts";
class Database {
constructor(context) {
@@ -37,6 +38,7 @@ class Database {
await this.trash.init(this.notes, this.notebooks, this.delta, this.text);
this.syncer = new Sync(this);
this.vault = new Vault(this, this.context);
this.conflicts = new Conflicts(this);
this.lookup = new Lookup(this);
}