From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj b/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj
index 21f1188..8a9b0d3 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj
@@ -10,7 +10,6 @@
<ItemGroup>
<Compile Remove="01-pump\04-special\04-variable-speed\**" />
<Compile Remove="02-valve\**" />
- <Compile Remove="99-temp\Clipboard\**" />
<Compile Remove="bak2\**" />
<Compile Remove="bak3\**" />
<Compile Remove="v1 - 澶嶅埗\**" />
@@ -18,7 +17,6 @@
<Compile Remove="v2\**" />
<EmbeddedResource Remove="01-pump\04-special\04-variable-speed\**" />
<EmbeddedResource Remove="02-valve\**" />
- <EmbeddedResource Remove="99-temp\Clipboard\**" />
<EmbeddedResource Remove="bak2\**" />
<EmbeddedResource Remove="bak3\**" />
<EmbeddedResource Remove="v1 - 澶嶅埗\**" />
@@ -26,7 +24,6 @@
<EmbeddedResource Remove="v2\**" />
<None Remove="01-pump\04-special\04-variable-speed\**" />
<None Remove="02-valve\**" />
- <None Remove="99-temp\Clipboard\**" />
<None Remove="bak2\**" />
<None Remove="bak3\**" />
<None Remove="v1 - 澶嶅埗\**" />
@@ -34,7 +31,6 @@
<None Remove="v2\**" />
<Page Remove="01-pump\04-special\04-variable-speed\**" />
<Page Remove="02-valve\**" />
- <Page Remove="99-temp\Clipboard\**" />
<Page Remove="bak2\**" />
<Page Remove="bak3\**" />
<Page Remove="v1 - 澶嶅埗\**" />
@@ -139,6 +135,9 @@
<Compile Update="03-valve\02-edit\ValveEditChart.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="99-temp\Clipboard\ClipboardCurveTextSelDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
@@ -157,7 +156,6 @@
<Folder Include="00-core\03-view-model\02-paras\disp-paras\" />
<Folder Include="01-pump\03-import\01-excel\" />
<Folder Include="02-universal\03-import\01-excel\" />
- <Folder Include="99-temp\" />
<Folder Include="Properties\DataSources\" />
</ItemGroup>
--
Gitblit v1.9.3