Skip to content

S
spring-boot
Commit f02887b6 authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Merge branch '2.0.x' into 2.1.x

parents 45ae97a4 9c3af103
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksEndpointAutoConfigurationTests.java
View file @ f02887b6
...@@ -62,7 +62,7 @@ public class ScheduledTasksEndpointAutoConfigurationTests { ...@@ -62,7 +62,7 @@ public class ScheduledTasksEndpointAutoConfigurationTests {
} }
@Configuration @Configuration
private static class CustomEndpointConfiguration { static class CustomEndpointConfiguration {
@Bean @Bean
public CustomEndpoint customEndpoint() { public CustomEndpoint customEndpoint() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment