From 38805b9b87e8762ae1d3c6361216dca380dda076 Mon Sep 17 00:00:00 2001 From: edgerunnergit Date: Mon, 30 Jan 2023 14:35:17 +0530 Subject: [PATCH] resolve changes.md conflicts for actix-web --- actix-web/CHANGES.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actix-web/CHANGES.md b/actix-web/CHANGES.md index f9a4c2240..b75a1ecdb 100644 --- a/actix-web/CHANGES.md +++ b/actix-web/CHANGES.md @@ -6,8 +6,8 @@ - Add `ErrorHandlers::default_handler()` (as well as `default_handler_{server, client}()`) to make registering handlers for groups of response statuses easier. [#2784] - Add `Logger::custom_response_replace()`. [#2631] - Add rudimentary redirection service at `web::redirect()` / `web::Redirect`. [#1961] -- Add `guard::Acceptable` for matching against `Accept` header mime types. [#2265] -- Add fallible versions of test helpers: `try_call_service`, `try_call_and_read_body_json`, `try_read_body`, and `try_read_body_json`. [#2961] +- Add `guard::Acceptable` for matching against `Accept` header MIME types. [#2265] +- Add fallible versions of `test` helpers: `try_call_service()`, `try_call_and_read_body_json()`, `try_read_body()`, and `try_read_body_json()`. [#2961] - Add `guard::Custom()` for handling `#[route]` macro with custom Methods. . [#2969] ### Fixed