From 89b8562ad1fb3943db3ffb922544afb3ce57e457 Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期一, 07 三月 2022 17:06:28 +0800
Subject: [PATCH] 待审核增加通道筛选

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

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

--
Gitblit v1.9.1