This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.3.0-beta.1-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git

commit 0b2b9f735a35869936c205eca866b4f3c5a0ac3a
Author: Albumen Kevin <[email protected]>
AuthorDate: Tue Sep 26 16:38:32 2023 +0800

    Fix conflicts
---
 .../dubbo/remoting/transport/netty4/PortUnificationServerTest.java       | 1 +
 1 file changed, 1 insertion(+)

diff --git 
a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/PortUnificationServerTest.java
 
b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/PortUnificationServerTest.java
index 12f3fc8905..21b0c8efa9 100644
--- 
a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/PortUnificationServerTest.java
+++ 
b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/PortUnificationServerTest.java
@@ -30,6 +30,7 @@ import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import static 
org.apache.dubbo.common.constants.CommonConstants.EXECUTOR_MANAGEMENT_MODE_DEFAULT;
+import static org.apache.dubbo.common.constants.CommonConstants.EXT_PROTOCOL;
 
 class PortUnificationServerTest {
 

Reply via email to