충돌 해결

src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml

@@ -6840,7 +6840,6 @@ VALUES
 		
 	</select>
 	
-<<<<<<< HEAD
 	<select id="VEEduMIXDAO.selectExprnEndPagingList" parameterClass="VEEduAplctVO" resultClass="VEEduAplctVO">
 		/*	임시.*NOT_SQL_LOG.*  VEEduMIXDAO.selectPagingList	*/
 		SELECT
@@ -7638,7 +7637,8 @@ VALUES
 			*/
 			OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;
 		</isNotEqual>
-=======
+	</select>
+	
 	<select id="VEEduMIXDAO.selectEduCmpltCrtfcNmbrList" parameterClass="VEEduAplctVO" resultClass="VEEduAplctVO">
 		/* VEEduMIXDAO.selectEduCmpltCrtfcNmbrList */
 		SELECT
@@ -7653,6 +7653,5 @@ VALUES
 		AND vad.EDU_CMPLT_CRTFC_NMBR IS NOT null
 		AND vad.EDU_CMPLT_CRTFC_NMBR LIKE TO_CHAR(SYSDATE, 'YYYY') || '%'; /* 현재연도로 시작하는지 확인 */		
 		
->>>>>>> refs/heads/hylee
 	</select>
 </sqlMap>