From e50c542be425a509c07dceeb7477958bb2e20509 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期五, 24 二月 2023 13:23:05 +0800
Subject: [PATCH] 冲突
---
WinFormUI/IStation.WinFormUI.Project/IStation.WinFormUI.Project.csproj | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/WinFormUI/IStation.WinFormUI.Project/IStation.WinFormUI.Project.csproj b/WinFormUI/IStation.WinFormUI.Project/IStation.WinFormUI.Project.csproj
index 1704050..d961930 100644
--- a/WinFormUI/IStation.WinFormUI.Project/IStation.WinFormUI.Project.csproj
+++ b/WinFormUI/IStation.WinFormUI.Project/IStation.WinFormUI.Project.csproj
@@ -117,7 +117,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="project\CreateProjectDlg.resx">
<DependentUpon>CreateProjectDlg.cs</DependentUpon>
</EmbeddedResource>
--
Gitblit v1.9.3