From e1190c55b49d8f3ee89fa1bd715aa579395d98ed Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期二, 22 三月 2022 09:37:26 +0800
Subject: [PATCH] 解决冲突

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

diff --git a/web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt b/web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt
index 22f6468..7c6f6b2 100644
--- a/web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt
+++ b/web/Dao/obj/Release/Dao.csproj.FileListAbsolute.txt
@@ -73,3 +73,4 @@
 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\obj\Release\Dao.pdb
 =======
 >>>>>>> Stashed changes
+D:\Company\SMGW_NewWeb\web\Dao\obj\Release\Dao.csproj.CopyComplete

--
Gitblit v1.9.1