From ee15dec5d91adbd1bdf15b26915b79751c17e481 Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期二, 22 三月 2022 09:39:17 +0800
Subject: [PATCH] 解决冲突

---
 web/web/web.config |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/web/web/web.config b/web/web/web.config
index eaa8087..0bacb15 100644
--- a/web/web/web.config
+++ b/web/web/web.config
@@ -41,7 +41,7 @@
             璇嗗埆杩涘叆鐢ㄦ埛鐨�
             瀹夊叏韬唤楠岃瘉妯″紡銆� 
         -->
-    <authentication mode="Windows"/>
+    <!--<authentication mode="Windows"/>-->
     <!--
             濡傛灉鍦ㄦ墽琛岃姹傜殑杩囩▼涓嚭鐜版湭澶勭悊鐨勯敊璇紝
             鍒欓�氳繃 <customErrors> 鑺傚彲浠ラ厤缃浉搴旂殑澶勭悊姝ラ銆傚叿浣撹鏉ワ紝

--
Gitblit v1.9.1