Remove expected FS events

2026-05-12 22:18:10 +01:00 · 2026-05-12 22:18:10 +01:00 · 935ed9c8e7
commit 935ed9c8e7
parent cd08cd80c7
13 changed files with 129 additions and 243 deletions
--- a/sync-server/src/server/update_document.rs
+++ b/sync-server/src/server/update_document.rs
@ -244,7 +244,8 @@ pub async fn update_document(
            let content_clone = content.clone();

            let merged = tokio::task::spawn_blocking(move || {
-                let merged = reconcile(
+                
+                reconcile(
                    &parent_owned,
                    &latest_owned.into(),
                    &new_owned.into(),
@ -252,8 +253,7 @@ pub async fn update_document(
                )
                .apply()
                .text()
-                .into_bytes();
-                merged
+                .into_bytes()
            })
            .await
            .map_err(|e| server_error(anyhow::anyhow!("Reconcile task failed: {e}")))?;