fix conflict

QuakeGod

2023-10-20 6fa60de2b0d0237054aa7571191df0f291838031

 MTerm1/MTerm1.vcxproj.filters

@@ -174,6 +174,12 @@
    <ClInclude Include="CMyPropPage.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="CMyPaneInputShow.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="MyFormInputShow.h">

      <Filter>头文件</Filter>

    </ClInclude>

  </ItemGroup>

  <ItemGroup>

    <ClCompile Include="MainFrm.cpp">

@@ -323,6 +329,12 @@
    <ClCompile Include="CMyPropPage.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="CMyPaneInputShow.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="MyFormInputShow.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ResourceCompile Include="MTerm1.rc">