Fix rebase from master

2019-09-16 09:50:58 +02:00
parent ece29bbdfc
commit 9065c4997d
2 changed files with 2 additions and 3 deletions
--- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractJupiterTestWithConfigAndTestable.java
+++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractJupiterTestWithConfigAndTestable.java
@@ -23,7 +23,7 @@ import org.springframework.context.annotation.Configuration;
@Testable
 public abstract class AbstractJupiterTestWithConfigAndTestable {

-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	static class Config {

 	}