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

---
 web/web/Bin/Release/Publish/bin/main.master.cdcab7d2.compiled |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/web/web/Bin/Release/Publish/bin/main.master.cdcab7d2.compiled b/web/web/Bin/Release/Publish/bin/main.master.cdcab7d2.compiled
index 40dbb7b..211244f 100644
--- a/web/web/Bin/Release/Publish/bin/main.master.cdcab7d2.compiled
+++ b/web/web/Bin/Release/Publish/bin/main.master.cdcab7d2.compiled
@@ -1,5 +1,9 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
+<<<<<<< Updated upstream
 <preserve resultType="3" virtualPath="/web/Main.master" hash="fffffff0f8c188f4" filehash="6304f7db2c3071db" flags="110000" assembly="App_Web_tlwmm4hc" type="ASP.main_master">
+=======
+<preserve resultType="3" virtualPath="/web/Main.master" hash="fffffff0f8c188f4" filehash="60363fc5b86526bf" flags="110000" assembly="App_Web_p2jueioo" type="ASP.main_master">
+>>>>>>> Stashed changes
     <filedeps>
         <filedep name="/web/Main.master" />
         <filedep name="/web/Main.master.cs" />

--
Gitblit v1.9.1