Skip to content

S
spring-boot
Commit f0ef6933 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '2.0.x' into 2.1.x

parents 8c3cec8f c2eeeb03
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/integrationtest/HttpTunnelIntegrationTests.java
View file @ f0ef6933
...@@ -128,7 +128,7 @@ public class HttpTunnelIntegrationTests { ...@@ -128,7 +128,7 @@ public class HttpTunnelIntegrationTests {
} }
@Configuration @org.springframework.context.annotation.Configuration
static class TunnelConfiguration { static class TunnelConfiguration {
@Bean @Bean
......
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