From 9f5df1b277c9f72f0aeb847de042de4934286f60 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期一, 14 三月 2022 11:57:12 +0800
Subject: [PATCH] Test
---
web/web/Bin/Release/Publish/bin/error.aspx.cdcab7d2.compiled | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/web/web/Bin/Release/Publish/bin/error.aspx.cdcab7d2.compiled b/web/web/Bin/Release/Publish/bin/error.aspx.cdcab7d2.compiled
index fc79925..de20629 100644
--- a/web/web/Bin/Release/Publish/bin/error.aspx.cdcab7d2.compiled
+++ b/web/web/Bin/Release/Publish/bin/error.aspx.cdcab7d2.compiled
@@ -1,5 +1,9 @@
锘�<?xml version="1.0" encoding="utf-8"?>
+<<<<<<< Updated upstream
<preserve resultType="3" virtualPath="/web/Error.aspx" hash="fffffff0f8c188f4" filehash="821a1ec5afbea06d" flags="110000" assembly="App_Web_oibi53em" type="ASP.error_aspx">
+=======
+<preserve resultType="3" virtualPath="/web/Error.aspx" hash="fffffff0f8c188f4" filehash="3ab940e557f2526a" flags="110000" assembly="App_Web_fx5xac0k" type="ASP.error_aspx">
+>>>>>>> Stashed changes
<filedeps>
<filedep name="/web/Error.aspx" />
<filedep name="/web/Error.aspx.cs" />
--
Gitblit v1.9.1