From 66664e5ed9089bb001b29ab6705ce6c2ff013f7f Mon Sep 17 00:00:00 2001
From: wulingxiao <1251605638@qqcom>
Date: Mon, 4 Jul 2022 20:30:29 +0800
Subject: [PATCH] resolve the conflicts and add CHANGELOG

---
 .../tencent/cloud/polaris/loadbalancer/LoadBalancerUtils.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git 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
index ed60df003..0199d0322 100644
--- 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;