From 6fa60de2b0d0237054aa7571191df0f291838031 Mon Sep 17 00:00:00 2001
From: QuakeGod <quakegod@sina.com>
Date: 星期五, 20 十月 2023 22:27:53 +0800
Subject: [PATCH] fix conflict
---
MTerm1/MTerm1.vcxproj.filters | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/MTerm1/MTerm1.vcxproj.filters b/MTerm1/MTerm1.vcxproj.filters
index 5d9633d..6095a5d 100644
--- a/MTerm1/MTerm1.vcxproj.filters
+++ b/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">
--
Gitblit v1.9.1