fix merge error

2017-06-30 19:33:31 -06:00
parent c44c3f37e4
commit 80b91d0a03
2 changed files with 3 additions and 3 deletions
--- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/LifecycleMvcEndpointAutoConfiguration.java
+++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/LifecycleMvcEndpointAutoConfiguration.java
@@ -43,7 +43,6 @@ import org.springframework.context.annotation.Configuration;
 */
@Configuration
@ConditionalOnWebApplication
-@ConditionalOnBean(RestartEndpoint.class)
 //TODO: support reactive
@AutoConfigureAfter({ WebMvcAutoConfiguration.class,
 		RefreshEndpointAutoConfiguration.class })