From 03d25bd51299b0ab6e2e1fba9ff4e86cd6dbf6bf Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Tue, 10 Oct 2023 14:06:57 +0900
Subject: [PATCH] no message

---
 src/main/resources/application.yml | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 15dc451c..101898bc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,32 +2,11 @@ server:
   port: 39700
   servlet:
     context-path: /
-<<<<<<< HEAD
   tomcat:
     basedir: "."
     accesslog:
       enabled: true
-          
-=======
-<<<<<<< HEAD
-           
-=======
-    
-#  ssl: 
-#    enabled: true
-#    key-alias: fimskeystore
-#    key-store: classpath:fimskeystore.pkcs12
-#    key-store-password: 'Xit5811807@)@#'
-#    key-password: 'Xit5811807@)@#'
-#    trust-store: classpath:fimstrust.pkcs12
-#    trust-store-password: 'Xit5811807@)@#'
-    
-#  tomcat:
-#    remoteip:
-#      protocol-header-https-value: https             
-    
->>>>>>> 0cc6b7e54c69a7387e08797d174497c13f01b6b7
->>>>>>> f545a75138a61a5df3a5fe98f5872eb4e24d26ba
+       
 spring:
   application:
     name: dummy-external-system