no message

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