diff --git a/Base/bin/Debug/MyBatis/Maps/CM.xml b/Base/bin/Debug/MyBatis/Maps/CM.xml
index d2d04ca..fef514f 100644
--- a/Base/bin/Debug/MyBatis/Maps/CM.xml
+++ b/Base/bin/Debug/MyBatis/Maps/CM.xml
@@ -2250,9 +2250,6 @@
         <isNotNull property="year">and year(a.sstime)=#year#</isNotNull>
         order by a.sstime,a.setime 
       </select>
-<<<<<<< HEAD
-=======
-	
         <select id="cm.cminningscds.applyedu.my" parameterClass="hashtable" resultClass="cminningscd">
             select
                 a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth,a.comment
@@ -2329,6 +2326,5 @@
 			where a.cmno=#cmno# and a.isdel=0
 			order by rsno<!--estkind,rno-->
 		</select>
->>>>>>> ca8967d (추가개발1)
     </statements>
 </sqlMap>
\ No newline at end of file