From 8744954a845855a4e30786555c66ea693d5c70a4 Mon Sep 17 00:00:00 2001
From: wzp <2880584989@qq.com>
Date: 星期一, 11 十月 2021 19:05:10 +0800
Subject: [PATCH] 修改

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

diff --git a/web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache b/web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache
index 40c0a9e..3bc0822 100644
--- a/web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache
+++ b/web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache
@@ -1 +1,5 @@
+<<<<<<< HEAD
+ba5129b8c35f1e2785f99668fd04dd28b6d68368
+=======
 c546f08e5171d2ea11491af4c442ff223c9bb58c
+>>>>>>> Release

--
Gitblit v1.9.1