From 9c1af7f5ec91917b4276b25406c86386fd337fbb Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 29 十一月 2024 16:35:44 +0800
Subject: [PATCH] 修改冲突后问题

---
 WinFrmUI/PBS.WinFrmUI.WE.Core/PBS.WinFrmUI.WE.Core.csproj.user |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/WinFrmUI/PBS.WinFrmUI.WE.Core/PBS.WinFrmUI.WE.Core.csproj.user b/WinFrmUI/PBS.WinFrmUI.WE.Core/PBS.WinFrmUI.WE.Core.csproj.user
index 2098acc..29bd186 100644
--- a/WinFrmUI/PBS.WinFrmUI.WE.Core/PBS.WinFrmUI.WE.Core.csproj.user
+++ b/WinFrmUI/PBS.WinFrmUI.WE.Core/PBS.WinFrmUI.WE.Core.csproj.user
@@ -11,7 +11,7 @@
     <Compile Update="WaterUtensil\WaterUtensilMgr.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Update="鏂版枃浠跺す\WaterEquivalentMgr.cs">
+    <Compile Update="WaterWE\WaterEquivalentMgr.cs">
       <SubType>UserControl</SubType>
     </Compile>
   </ItemGroup>

--
Gitblit v1.9.3