From 1db73f1f1904f39f45caf44b99339b1e13ffe16a Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期三, 02 三月 2022 11:14:41 +0800
Subject: [PATCH] 待审核增加通道筛选

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

diff --git a/web/web/Bin/Release/Publish/bin/index.aspx.cdcab7d2.compiled b/web/web/Bin/Release/Publish/bin/index.aspx.cdcab7d2.compiled
index cdab61f..02b96e1 100644
--- a/web/web/Bin/Release/Publish/bin/index.aspx.cdcab7d2.compiled
+++ b/web/web/Bin/Release/Publish/bin/index.aspx.cdcab7d2.compiled
@@ -1,5 +1,9 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
+<<<<<<< Updated upstream
 <preserve resultType="3" virtualPath="/web/Index.aspx" hash="fffffff0f8c188f4" filehash="77abb193f96e73dc" flags="110000" assembly="App_Web_tlwmm4hc" type="ASP.index_aspx">
+=======
+<preserve resultType="3" virtualPath="/web/Index.aspx" hash="fffffff0f8c188f4" filehash="69a4ad5e65b163e2" flags="110000" assembly="App_Web_p2jueioo" type="ASP.index_aspx">
+>>>>>>> Stashed changes
     <filedeps>
         <filedep name="/web/Index.aspx" />
         <filedep name="/web/Index.aspx.cs" />

--
Gitblit v1.9.1