win 10/13

socket/application.pid

@@ -1 +1 @@
-21792
+9388

socket/src/main/java/kr/gmtc/comp/socket/udp/UDPSocket.java

@@ -130,12 +130,6 @@ public class UDPSocket {
 
         try {
             udpport.setActive(false);
-
-<<<<<<< Updated upstream
-           
-
-=======
->>>>>>> Stashed changes
             if(inOut.equals("SEND")) {
 
                 udpport.setRemoteHost(ip);
@@ -143,11 +137,6 @@ public class UDPSocket {
                 udpport.setActive(true);
 
             }else{
-<<<<<<< Updated upstream
-                 udpport.setLocalPort(port);
-=======
-                udpport.setLocalPort(port);
->>>>>>> Stashed changes
                 udpport.setActive(true);
 
                 if( !(multiCastGroup == null || multiCastGroup.equals("")) )

socket/src/main/resources/application.yml

@@ -6,7 +6,7 @@ spring:
              - winTest
 
 server:
-  port: 18080
+  port: 18090
 
 root: D:\Workspace\Odroid_repository\SACP_Components\socket