From 9f5df1b277c9f72f0aeb847de042de4934286f60 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期一, 14 三月 2022 11:57:12 +0800
Subject: [PATCH] Test

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

diff --git a/web/UMCLib/obj/Release/UMCLib.csproj.FileListAbsolute.txt b/web/UMCLib/obj/Release/UMCLib.csproj.FileListAbsolute.txt
index 539bede..ef8d5a0 100644
--- a/web/UMCLib/obj/Release/UMCLib.csproj.FileListAbsolute.txt
+++ b/web/UMCLib/obj/Release/UMCLib.csproj.FileListAbsolute.txt
@@ -14,3 +14,22 @@
 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Release\UMCLib.csproj.CopyComplete
 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Release\UMCLib.dll
 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Release\UMCLib.pdb
+D:\Company\SMGW_NewWeb\web\UMCLib\bin\Release\UMCLib.dll
+D:\Company\SMGW_NewWeb\web\UMCLib\bin\Release\UMCLib.pdb
+D:\Company\SMGW_NewWeb\web\UMCLib\bin\Release\Newtonsoft.Json.dll
+D:\Company\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.csproj.AssemblyReference.cache
+D:\Company\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.csproj.CoreCompileInputs.cache
+D:\Company\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.csproj.CopyComplete
+D:\Company\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.dll
+D:\Company\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.pdb
+<<<<<<< Updated upstream
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\bin\Release\UMCLib.dll
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\bin\Release\UMCLib.pdb
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\bin\Release\Newtonsoft.Json.dll
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.csproj.AssemblyReference.cache
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.csproj.CoreCompileInputs.cache
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.csproj.CopyComplete
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.dll
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.pdb
+=======
+>>>>>>> Stashed changes

--
Gitblit v1.9.1