From c653f2f6f2de553395b706de3a62fec5e4a6fbf7 Mon Sep 17 00:00:00 2001 From: duheng <2784771470@qq.com> Date: 星期四, 21 十一月 2024 17:52:18 +0800 Subject: [PATCH] 冲突 --- BLL/HStation.BLL.WE.Core/HStation.BLL.WE.Core.csproj | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BLL/HStation.BLL.WE.Core/HStation.BLL.WE.Core.csproj b/BLL/HStation.BLL.WE.Core/HStation.BLL.WE.Core.csproj index da967cb..99d4eef 100644 --- a/BLL/HStation.BLL.WE.Core/HStation.BLL.WE.Core.csproj +++ b/BLL/HStation.BLL.WE.Core/HStation.BLL.WE.Core.csproj @@ -26,14 +26,14 @@ </ItemGroup> <ItemGroup> - <Compile Remove="02-httpclient\EquivalentProject.cs" /> - <Compile Remove="02-httpclient\EquivalentProjectItem.cs" /> - <Compile Remove="02-httpclient\EquivalentProjectItemModel.cs" /> - <Compile Remove="02-httpclient\EquivalentProjectItemModelMap.cs" /> - <Compile Remove="03-localclient\EquivalentProject.cs" /> - <Compile Remove="03-localclient\EquivalentProjectItem.cs" /> - <Compile Remove="03-localclient\EquivalentProjectItemModel.cs" /> - <Compile Remove="03-localclient\EquivalentProjectItemModelMap.cs" /> + <Compile Remove="02-httpclient\WEProject.cs" /> + <Compile Remove="02-httpclient\WEProjectItem.cs" /> + <Compile Remove="02-httpclient\WEProjectItemModel.cs" /> + <Compile Remove="02-httpclient\WEProjectItemModelMap.cs" /> + <Compile Remove="03-localclient\WEProject.cs" /> + <Compile Remove="03-localclient\WEProjectItem.cs" /> + <Compile Remove="03-localclient\WEProjectItemModel.cs" /> + <Compile Remove="03-localclient\WEProjectItemModelMap.cs" /> </ItemGroup> <ItemGroup> -- Gitblit v1.9.3