From 4c4a22a2a58e847541162a671d745a7731e7bad4 Mon Sep 17 00:00:00 2001
From: jaewohong <jaewohong@phoenixdarts.com>
Date: Mon, 13 Oct 2025 16:31:54 +0900
Subject: [PATCH] =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/META-INF/context.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/WebContent/META-INF/context.xml b/WebContent/META-INF/context.xml
index e2156df..385912e 100644
--- a/WebContent/META-INF/context.xml
+++ b/WebContent/META-INF/context.xml
@@ -25,12 +25,6 @@
 
     <!-- url: The JDBC connection url for connecting to your MySQL database.
          -->
-<<<<<<< HEAD
-  <Resource name="jdbc/dsOBP_AGW" auth="Container" type="javax.sql.DataSource"
-               maxTotal="10" maxIdle="10" maxWaitMillis="10000"
-               username="AGWAPP" password="AGWAPP123!" driverClassName="oracle.jdbc.OracleDriver"
-               url="jdbc:oracle:thin:@192.168.240.177:1599:DAPM"/>
-=======
     <!-- 
   	<Resource name="NDAPIGW_APP_NXA" auth="Container" type="javax.sql.DataSource"
                maxTotal="10" initialSize="10" maxIdle="10" maxActive="10" maxWaitMillis="10000"
@@ -64,6 +58,5 @@
                url="jdbc:oracle:thin:@//192.168.240.177:1599/DAPM"/>
 
 
->>>>>>> 05596e9 (KJBank 암호화 관련 및 Sync 관련 수정)
 
 </Context>
\ No newline at end of file