From 9f5df1b277c9f72f0aeb847de042de4934286f60 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期一, 14 三月 2022 11:57:12 +0800
Subject: [PATCH] Test

---
 web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache b/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
index c7c818b..93b5477 100644
--- a/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
+++ b/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
-d136e7243de12f847333601a3e3b0ceb3bb3ede8
-=======
-6af597a13fdb848e58fc339638f9e6f7dfd89007
->>>>>>> remotes/origin/Release
+39dc77968f868863dd739e41a7700ce06bba8c93

--
Gitblit v1.9.1