fix conflict

QuakeGod

2023-10-20 6fa60de2b0d0237054aa7571191df0f291838031

 MTerm1/MTerm1.cpp

@@ -260,6 +260,7 @@
{

   //TODO: 处理可能已添加的附加资源

   AfxOleTerm(FALSE);

   //this->CleanState();



   return CWinAppEx::ExitInstance();

}