Merge branch '2.2.x'

Closes gh-19428
5 years ago · bd179393ea
parent 813c901905 9da62e2384
commit bd179393ea
1 changed files with 0 additions and 2 deletions
--- a/spring-boot-project/spring-boot/src/main/kotlin/org/springframework/boot/SpringApplicationExtensions.kt
+++ b/spring-boot-project/spring-boot/src/main/kotlin/org/springframework/boot/SpringApplicationExtensions.kt
@ -18,8 +18,6 @@ package org.springframework.boot
 import org.springframework.context.ConfigurableApplicationContext
 import kotlin.reflect.KClass
 /**
 * Top level function acting as a Kotlin shortcut allowing to write
 * `runApplication<FooApplication>(arg1, arg2)` instead of