diff --git a/BO/obj/Debug/BO.csproj.AssemblyReference.cache b/BO/obj/Debug/BO.csproj.AssemblyReference.cache
index d667233..a5a9444 100644
Binary files a/BO/obj/Debug/BO.csproj.AssemblyReference.cache and b/BO/obj/Debug/BO.csproj.AssemblyReference.cache differ
diff --git a/Dao/MyBatis/Maps/CM.xml b/Dao/MyBatis/Maps/CM.xml
index c8186db..445bfb1 100644
--- a/Dao/MyBatis/Maps/CM.xml
+++ b/Dao/MyBatis/Maps/CM.xml
@@ -2250,10 +2250,8 @@
         <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 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
                 ,a.studyplace, a.studyplacename,a.remainPeople
@@ -2329,6 +2327,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
diff --git a/FO/obj/Debug/FO.csproj.AssemblyReference.cache b/FO/obj/Debug/FO.csproj.AssemblyReference.cache
index 43b4d60..c040dc5 100644
Binary files a/FO/obj/Debug/FO.csproj.AssemblyReference.cache and b/FO/obj/Debug/FO.csproj.AssemblyReference.cache differ