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

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

diff --git a/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache b/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
index c81c0a4..db7c352 100644
--- a/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
+++ b/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
@@ -1,5 +1,9 @@
+<<<<<<< HEAD
 <<<<<<< Updated upstream
 c4762145da2a34560c5dc93e2958bfb07137e5f2
 =======
 4680df9d251d534abbe2f1eb51d69736b996d0d8
 >>>>>>> Stashed changes
+=======
+c4762145da2a34560c5dc93e2958bfb07137e5f2
+>>>>>>> 751731362e5fcf901065c25eaed0319cf7a27cc1

--
Gitblit v1.9.1