From d4da5a8fe9dfaa361a98acb14fcd3e9ae00d1689 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期五, 06 五月 2022 17:49:28 +0800
Subject: [PATCH] Merge branch 'Develop' of http://8.129.227.30:10801/r/SMGW_NewWeb into Develop

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

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

--
Gitblit v1.9.1