From 4d7b265258f82d25e1398b0188922d153b1064f7 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Wed, 15 Aug 2018 15:37:49 +0200 Subject: [PATCH] Fix merge conflict in reference manual --- src/docs/asciidoc/web/webflux.adoc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/docs/asciidoc/web/webflux.adoc b/src/docs/asciidoc/web/webflux.adoc index 797183c51b..90f9d29ff1 100644 --- a/src/docs/asciidoc/web/webflux.adoc +++ b/src/docs/asciidoc/web/webflux.adoc @@ -1749,14 +1749,10 @@ controller. The following code snippet shows the usage: [TIP] ==== -<<<<<<< HEAD Unlike the Servlet API "request parameter" concept that conflates query parameters, form -======= -Unlike the Servlet API "request paramater" concept that conflate query parameters, form ->>>>>>> parent of 7e91733502... Infer HTTP 404 from empty Optional/Publisher types data, and multiparts into one, in WebFlux each is accessed individually through the -`ServerWebExchange`. While `@RequestParam` binds to query parameters only, you can -use data binding to apply query paramerters, form data, and multiparts to a +`ServerWebExchange`. While `@RequestParam` binds to query parameters only, you can use +data binding to apply query parameters, form data, and multiparts to a <>. ====