Fix merge-forward

Author: bclozel

gradle/docs.gradle

@@ -137,11 +137,7 @@ asciidoctorj {
 			sectnums: '',
 			'source-highlighter': 'highlight.js',
 			highlightjsdir: 'js/highlight',
-<<<<<<< HEAD
-			'highlightjs-theme': 'googlecode',
-=======
 			'highlightjs-theme': 'github', // 'googlecode',
->>>>>>> 5.2.x
 			stylesdir: 'css/',
 			stylesheet: 'stylesheet.css',
 			'spring-version': project.version

src/docs/asciidoc/testing.adoc

@@ -8441,8 +8441,6 @@ Spring MVC Test's own tests include
 https://github.com/spring-projects/spring-framework/tree/master/spring-test/src/test/java/org/springframework/test/web/client/samples[example
 tests] of client-side REST tests.
 
-include::testing/testing-webtestclient.adoc[leveloffset=+2]
-
 
 [[testing-resources]]
 == Further Resources