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

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

diff --git a/web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache b/web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache
index 40c0a9e..3bf9622 100644
--- a/web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache
+++ b/web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-c546f08e5171d2ea11491af4c442ff223c9bb58c
+27f9b4fb5d36be9c155fb6557fe17e62c41ec4da

--
Gitblit v1.9.1