resolve the conflicts and add CHANGELOG

3 years ago · 66664e5ed9
parent b204ad7137
commit 66664e5ed9
1 changed files with 0 additions and 1 deletions
--- a/spring-cloud-tencent-polaris-loadbalancer/src/main/java/com/tencent/cloud/polaris/loadbalancer/LoadBalancerUtils.java
+++ b/spring-cloud-tencent-polaris-loadbalancer/src/main/java/com/tencent/cloud/polaris/loadbalancer/LoadBalancerUtils.java
@ -19,7 +19,6 @@
 package com.tencent.cloud.polaris.loadbalancer;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import com.tencent.cloud.common.metadata.MetadataContext;