From 78a0852831f1119372e36e90dc1e91ce46b8ef66 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期四, 14 四月 2022 09:13:50 +0800
Subject: [PATCH] 产品、订单
---
web/web/Bin/Release/Publish/bin/setting.ashx.cdcab7d2.compiled | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/web/web/Bin/Release/Publish/bin/setting.ashx.cdcab7d2.compiled b/web/web/Bin/Release/Publish/bin/setting.ashx.cdcab7d2.compiled
index a2ad0aa..2f72c93 100644
--- a/web/web/Bin/Release/Publish/bin/setting.ashx.cdcab7d2.compiled
+++ b/web/web/Bin/Release/Publish/bin/setting.ashx.cdcab7d2.compiled
@@ -1,5 +1,9 @@
锘�<?xml version="1.0" encoding="utf-8"?>
+<<<<<<< Updated upstream
<preserve resultType="2" virtualPath="/web/Setting.ashx" hash="ffffffff89671860" filehash="fffffc0158ca183c" flags="110000" assembly="App_Web_tlwmm4hc" type="SettingHandler">
+=======
+<preserve resultType="2" virtualPath="/web/Setting.ashx" hash="ffffffff89671860" filehash="ffffc3782af3c205" flags="110000" assembly="App_Web_p2jueioo" type="SettingHandler">
+>>>>>>> Stashed changes
<filedeps>
<filedep name="/web/Setting.ashx" />
</filedeps>
--
Gitblit v1.9.1