From a89e6ba4b31d13e437d04146490ba8f1c299da08 Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期二, 01 三月 2022 20:45:22 +0800
Subject: [PATCH] Merge branch 'Develop' of http://8.129.227.30:10801/r/SMGW_NewWeb into Develop

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

diff --git a/web/web/Bin/Release/Publish/bin/gwdiverter.ashx.cdcab7d2.compiled b/web/web/Bin/Release/Publish/bin/gwdiverter.ashx.cdcab7d2.compiled
index b5f0304..dff8873 100644
--- a/web/web/Bin/Release/Publish/bin/gwdiverter.ashx.cdcab7d2.compiled
+++ b/web/web/Bin/Release/Publish/bin/gwdiverter.ashx.cdcab7d2.compiled
@@ -1,5 +1,9 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
+<<<<<<< Updated upstream
 <preserve resultType="2" virtualPath="/web/gwdiverter.ashx" hash="ffffffff89671860" filehash="1b7d9c298c74" flags="110000" assembly="App_Web_tlwmm4hc" type="gwdiverterHandler">
+=======
+<preserve resultType="2" virtualPath="/web/gwdiverter.ashx" hash="ffffffff89671860" filehash="42ab9d50bc1d" flags="110000" assembly="App_Web_p2jueioo" type="gwdiverterHandler">
+>>>>>>> Stashed changes
     <filedeps>
         <filedep name="/web/gwdiverter.ashx" />
     </filedeps>

--
Gitblit v1.9.1