From 6f932c727fe72e5c3417812234371a35e7225a93 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 15 十月 2024 14:20:40 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
index 96dc058..57f8e32 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
@@ -103,5 +103,8 @@
<Compile Update="04-pump\PumpPropViewCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="04-pump\XtraUserControl1.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.3