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/default.aspx.cdcab7d2.compiled | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/web/web/Bin/Release/Publish/bin/default.aspx.cdcab7d2.compiled b/web/web/Bin/Release/Publish/bin/default.aspx.cdcab7d2.compiled
index 0dce556..0f621c4 100644
--- a/web/web/Bin/Release/Publish/bin/default.aspx.cdcab7d2.compiled
+++ b/web/web/Bin/Release/Publish/bin/default.aspx.cdcab7d2.compiled
@@ -1,5 +1,9 @@
锘�<?xml version="1.0" encoding="utf-8"?>
+<<<<<<< Updated upstream
<preserve resultType="3" virtualPath="/web/Default.aspx" hash="fffffff0f8c188f4" filehash="56f2c7d895e0c0df" flags="110000" assembly="App_Web_tlwmm4hc" type="ASP.default_aspx">
+=======
+<preserve resultType="3" virtualPath="/web/Default.aspx" hash="fffffff0f8c188f4" filehash="dcaccf08414a447a" flags="110000" assembly="App_Web_p2jueioo" type="ASP.default_aspx">
+>>>>>>> Stashed changes
<filedeps>
<filedep name="/web/Default.aspx" />
<filedep name="/web/Default.aspx.cs" />
--
Gitblit v1.9.1