From 687c3985d55d6322c388f285f8fade3adb4d603f Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Thu, 24 Sep 2020 18:48:43 +0200 Subject: [PATCH] Fix merge-forward --- gradle/docs.gradle | 4 ---- src/docs/asciidoc/testing.adoc | 2 -- 2 files changed, 6 deletions(-) diff --git a/gradle/docs.gradle b/gradle/docs.gradle index 500644e29b8..e2318d0e514 100644 --- a/gradle/docs.gradle +++ b/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 diff --git a/src/docs/asciidoc/testing.adoc b/src/docs/asciidoc/testing.adoc index 0e638edafe5..567961bf1f0 100644 --- a/src/docs/asciidoc/testing.adoc +++ b/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