From e9dc4cb45dc29c16c2681f53d749d1c88176b69a Mon Sep 17 00:00:00 2001
From: wzp <2880584989@qq.com>
Date: 星期四, 16 九月 2021 15:59:33 +0800
Subject: [PATCH] Squashed commit of the following:

---
 web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt b/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
index 114e5e9..dcf2b33 100644
--- a/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
+++ b/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
@@ -43,8 +43,15 @@
 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\obj\Debug\Model.pdb
 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Lib\Model.dll
 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Lib\Model.pdb
+<<<<<<< HEAD
+=======
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.AssemblyReference.cache
+>>>>>>> remotes/origin/Release
 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CopyComplete
 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Debug\Model.dll
 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Debug\Model.pdb
+<<<<<<< HEAD
 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.AssemblyReference.cache
+=======
+>>>>>>> remotes/origin/Release

--
Gitblit v1.9.1