aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs/dev/roadmap.md
diff options
context:
space:
mode:
Diffstat (limited to 'docs/dev/roadmap.md')
-rw-r--r--docs/dev/roadmap.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/dev/roadmap.md b/docs/dev/roadmap.md
index 9251e15..d2a4d3b 100644
--- a/docs/dev/roadmap.md
+++ b/docs/dev/roadmap.md
@@ -25,7 +25,7 @@ Replace the current Last-Write-Wins (LWW) conflict resolution with Automerge CRD
- [x] Modify `src/client/sync/push.ts` - Add crdtChanges to push payload
- [x] Modify `src/client/sync/pull.ts` - Handle crdtChanges in pull response
-- [ ] Modify `src/client/sync/conflict.ts` - Replace LWW with Automerge merge
+- [x] Modify `src/client/sync/conflict.ts` - Replace LWW with Automerge merge
- [ ] Modify `src/client/sync/manager.ts` - Integrate CRDT sync flow
### Phase 4: Server-Side CRDT Support