From 280ecfcd472b9357abd9e4f65a172b84a1b565fd Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 27 Jul 2020 16:00:47 +0100 Subject: [PATCH] Polish --- .../spring-boot-docs/src/docs/asciidoc/howto.adoc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc index 50cd504eb94..d15282d14a9 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc @@ -1436,12 +1436,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 {