이지우 - 충돌 오류 해결

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>