From 7bd27b4c5967ffaa87e8a813687da7edb909148c Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期二, 22 三月 2022 10:25:42 +0800
Subject: [PATCH] 1

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

diff --git a/web/Common/obj/Debug/Common.csproj.CoreCompileInputs.cache b/web/Common/obj/Debug/Common.csproj.CoreCompileInputs.cache
index 98a5f99..cef899f 100644
--- a/web/Common/obj/Debug/Common.csproj.CoreCompileInputs.cache
+++ b/web/Common/obj/Debug/Common.csproj.CoreCompileInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
-594ea1d1d31149d5ab62b73514761c3e2fad45a1
-=======
 24545a9dc9d59dd930ea24c26e7c09fb3e3a97a3
->>>>>>> Release

--
Gitblit v1.9.1