root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix merge-forward

This commit is contained in:
Brian Clozel 2020-09-24 18:48:43 +02:00
parent 6f04c7b60e
commit 687c3985d5
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gradle/docs.gradle
View File

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

2
src/docs/asciidoc/testing.adoc
View File

@ -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 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. tests] of client-side REST tests.
include::testing/testing-webtestclient.adoc[leveloffset=+2]
[[testing-resources]] [[testing-resources]]
== Further Resources == Further Resources