From a6bfa607977efcc13ffd6c2450a94c7dc8f85920 Mon Sep 17 00:00:00 2001
From: jiwoo <jiwoo@DESKTOP-SIDMR4Q>
Date: Mon, 18 Dec 2023 17:57:43 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=B6=A9?=
 =?UTF-8?q?=EB=8F=8C=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml
index 26124c45..c550492e 100644
--- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml
@@ -3459,7 +3459,6 @@
                  )bbb			
                  on(bbb.prcs_aplct_prd_ord=aaa.prcsOrd)	
 		GROUP BY rollup(yr, bbb.prcs_nm)				   	
-<<<<<<< HEAD
 	</select>		
 	
 	<select id="VEInstrMixDAO.findByIdFromVeInstr" parameterClass="VEInstrDetailVO" resultClass="VELctrDetailVO">
@@ -3481,7 +3480,6 @@
 			USER_ID = #userId#
 			
 	</select>
-=======
 	</select>
 	
 	<delete id="VEInstrMixDAO.deleteInstrEmailCrtfd" parameterClass="VEInstrDetailVO">
@@ -3540,5 +3538,4 @@
 		WHERE instr_detail_ord = #instrDetailOrd#
 		AND instr_div = #instrDiv#
 	</update>
->>>>>>> refs/heads/JIWOO
 </sqlMap>