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

---
 web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache b/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
index 21ddc74..2fa7cbb 100644
--- a/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
+++ b/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
@@ -1,9 +1,5 @@
 <<<<<<< HEAD
-<<<<<<< Updated upstream
-03ac8fb778df47064b4ab65f28af8408156b7fa4
+0c60e0363c7ebe19e617b065424b04ecbc8fd3d6
 =======
-4e3d3c0d46e0394eded6a28ceeaec6a8f69625db
->>>>>>> Stashed changes
-=======
-03ac8fb778df47064b4ab65f28af8408156b7fa4
->>>>>>> 751731362e5fcf901065c25eaed0319cf7a27cc1
+ffceac74583ffe022717b2538e55c4e28b8e84c0
+>>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c

--
Gitblit v1.9.1