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/gwclient.ashx.cdcab7d2.compiled | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/web/web/Bin/Release/Publish/bin/gwclient.ashx.cdcab7d2.compiled b/web/web/Bin/Release/Publish/bin/gwclient.ashx.cdcab7d2.compiled
index 5a5ceab..30e1d43 100644
--- a/web/web/Bin/Release/Publish/bin/gwclient.ashx.cdcab7d2.compiled
+++ b/web/web/Bin/Release/Publish/bin/gwclient.ashx.cdcab7d2.compiled
@@ -1,5 +1,9 @@
锘�<?xml version="1.0" encoding="utf-8"?>
+<<<<<<< Updated upstream
<preserve resultType="2" virtualPath="/web/GwClient.ashx" hash="ffffffff89671860" filehash="ffffde6c2501c432" flags="110000" assembly="App_Web_tlwmm4hc" type="GwClientHandler">
+=======
+<preserve resultType="2" virtualPath="/web/GwClient.ashx" hash="ffffffff89671860" filehash="27074ba7f6f6" flags="110000" assembly="App_Web_p2jueioo" type="GwClientHandler">
+>>>>>>> Stashed changes
<filedeps>
<filedep name="/web/GwClient.ashx" />
</filedeps>
--
Gitblit v1.9.1