From d0c75f7d03385bacf4cb4eaf700b4716c332a45b Mon Sep 17 00:00:00 2001 From: spencergibb Date: Sun, 18 Oct 2020 11:57:22 -0400 Subject: [PATCH] Fixes merge duplicate import --- .../dependency/DependencyFeignClientAutoConfiguration.java | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyFeignClientAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyFeignClientAutoConfiguration.java index 704fadb7..fb9211d0 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyFeignClientAutoConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyFeignClientAutoConfiguration.java @@ -33,7 +33,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.client.loadbalancer.reactive.LoadBalancerProperties; -import org.springframework.cloud.client.loadbalancer.reactive.LoadBalancerProperties; import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient; import org.springframework.cloud.loadbalancer.config.BlockingLoadBalancerClientAutoConfiguration; import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient;