수정

2026-01-15 15:17:15 +09:00
parent e563dba1bf
commit bf89cd3451
1 changed files with 0 additions and 3 deletions
@@ -618,10 +618,7 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
 				jsonStr = KJB_ROOTLESS_ARRAY + jsonStr + "}";
 				responseMessage = jsonStr.getBytes(vo.getEncode());
 			}
-<<<<<<< HEAD

-=======
->>>>>>> branch 'jenkins_with_weblogic' of ssh://git@192.168.240.178:18081/eapim/elink-online-common.git

 			return assignResponseHeaders(method, responseMessage, headerGroupName, vo.getEncode(), messageType,
 					relayResponseHeaderKeys, status, responseHeaderProp);