From c705bc16fbe92e0f6dea9e0c12636052d4cfb66c Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 07 三月 2025 10:26:11 +0800
Subject: [PATCH] 四维尔防错:通讯数据格式变更  软件修改

---
 SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
index 92664e7..97979d2 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,15 +1,5 @@
-<<<<<<< HEAD
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
-=======
-E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
-E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
-E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
-E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
-E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
-E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
->>>>>>> 7cce3c1dbda47d04067ab78a6eebcdbbca9ba246

--
Gitblit v1.9.1