Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.3.x'

Browse Source
This commit is contained in:
Andy Wilkinson 2020-07-27 16:00:54 +01:00
commit 1c22ec9373
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc
View File

@ -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 {