Merge branch '2.3.x'

1c22ec93 · Andy Wilkinson · 4c45c265 · 280ecfcd · 1c22ec93
Commit 1c22ec93 authored Jul 27, 2020 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

howto.adoc ...oot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc +0 -5

No files found.
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc
@@ -1426,12 +1426,7 @@ And the following example shows one way to set up the starters in Gradle:
 [source,groovy,indent=0,subs="verbatim,quotes,attributes"]
 ----
 	dependencies {
-<<<<<<< HEAD:spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc
-		implementation 'org.springframework.boot:spring-boot-starter-web'
-		implementation 'org.springframework.boot:spring-boot-starter-log4j2'
-=======
 		compile 'org.springframework.boot:spring-boot-starter-web'
->>>>>>> 2.2.x:spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc
 	}

 	configurations.all {