thecodrr 50c95461b1 fix: unexpected merge conflicts on multiple devices

2021-07-03 12:14:11 +05:00

..

collector.js

feat: add localOnly prop to note

2021-04-06 09:13:06 +05:00

conflicts.js

sync: prepare -> collector, other optimizations

2020-04-16 03:04:44 +05:00

index.js

fix: unexpected merge conflicts on multiple devices

2021-07-03 12:14:11 +05:00

merger.js

fix: exception when mergin locked notes

2021-06-17 10:41:50 +05:00

utils.js

fix: make sure object is not null

2020-10-29 14:02:41 +05:00