From 088ffc818b13bf7bca56eb2f7f323d833fce382c Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期一, 20 六月 2022 21:28:52 +0800
Subject: [PATCH] 首页：通道状态

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

diff --git a/web/Common/obj/Debug/Common.csproj.CoreCompileInputs.cache b/web/Common/obj/Debug/Common.csproj.CoreCompileInputs.cache
index 98a5f99..102e063 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
+4d2c39d51ee4afe984b12afe838461ebc03c777b

--
Gitblit v1.9.1