From ba927b1faad68ab38d053ee9ea9eeac4b1a5531b Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期一, 09 三月 2026 08:23:10 +0800
Subject: [PATCH] resolve merge conflicts: keep theirs for all binary files
---
LMES/LMES.csproj | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/LMES/LMES.csproj b/LMES/LMES.csproj
index c96af39..b5ec6a3 100644
--- a/LMES/LMES.csproj
+++ b/LMES/LMES.csproj
@@ -261,10 +261,6 @@
<Project>{c518f792-17cd-4894-99e5-c0ea4f59e0f3}</Project>
<Name>WarM</Name>
</ProjectReference>
- <ProjectReference Include="..\WebAPI\WebAPI.csproj">
- <Project>{5b60ce0c-963c-4dc2-91b3-0b471aac5438}</Project>
- <Name>WebAPI</Name>
- </ProjectReference>
<ProjectReference Include="..\WorkM\WorkM.csproj">
<Project>{38499782-d273-45ee-a5a4-19ac1fc36444}</Project>
<Name>WorkM</Name>
--
Gitblit v1.9.1