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

---
 web/UMCLib/obj/Release/UMCLib.csproj.CoreCompileInputs.cache |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/web/UMCLib/obj/Release/UMCLib.csproj.CoreCompileInputs.cache b/web/UMCLib/obj/Release/UMCLib.csproj.CoreCompileInputs.cache
index cbad6a9..ed11994 100644
--- a/web/UMCLib/obj/Release/UMCLib.csproj.CoreCompileInputs.cache
+++ b/web/UMCLib/obj/Release/UMCLib.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-4e46879d79322e56a42a5667873b8b1effa2932f
+fa96c443ff4c3eda7263ab6de8b0bbba4c306077

--
Gitblit v1.9.1