From d1260ca2da3dc8841364dc4ddbbcad01ecfc3db1 Mon Sep 17 00:00:00 2001 From: Seongmin Lee Date: Wed, 23 Sep 2026 03:50:10 +0900 Subject: [PATCH] Revert "knot2: restore merge route" hello lewis This reverts commit d5d6656c52ec5af53ce55a9f0b9478c4eec3d90d. Signed-off-by: Seongmin Lee --- knot2/crates/knot-xrpc/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knot2/crates/knot-xrpc/src/lib.rs b/knot2/crates/knot-xrpc/src/lib.rs index 1b7b9a9a7..4005ff286 100644 --- a/knot2/crates/knot-xrpc/src/lib.rs +++ b/knot2/crates/knot-xrpc/src/lib.rs @@ -319,7 +319,7 @@ impl FromRequestParts for Method { pub fn router(state: Arc>) -> Router { let merge_routes = Router::new() - .route(merge::MERGE_ROUTE, post(merge::merge::)) + // .route(merge::MERGE_ROUTE, post(merge::merge::)) .route(merge::MERGE_CHECK_ROUTE, post(merge::merge_check::)) .layer(DefaultBodyLimit::max(state.byte_limits.patch.get())); Router::new() -- 2.51.2