From e1190c55b49d8f3ee89fa1bd715aa579395d98ed Mon Sep 17 00:00:00 2001 From: wangsheng <123456> Date: 星期二, 22 三月 2022 09:37:26 +0800 Subject: [PATCH] 解决冲突 --- web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt b/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt index 855723c..2853526 100644 --- a/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt +++ b/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt @@ -58,8 +58,8 @@ D:\Company\SMGW_NewWeb\web\UMCLib\bin\Debug\UMCLib.dll D:\Company\SMGW_NewWeb\web\UMCLib\bin\Debug\UMCLib.pdb D:\Company\SMGW_NewWeb\web\UMCLib\bin\Debug\Newtonsoft.Json.dll +D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.AssemblyReference.cache D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.CoreCompileInputs.cache D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.CopyComplete D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.dll D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.pdb -D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.AssemblyReference.cache -- Gitblit v1.9.1