From 23da5f0dc0d0b094e92d3154f46226fb00fb4eef Mon Sep 17 00:00:00 2001
From: minom <minomdu@gmail.com>
Date: Mon, 8 Jun 2026 13:41:33 +0800
Subject: [PATCH] modify

---
 web/web.config | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/web/web.config b/web/web.config
index 4019585..25b4be6 100644
--- a/web/web.config
+++ b/web/web.config
@@ -42,14 +42,9 @@
     <add key="UseSearchKeywords" value="true" />
     <!--網站的簡稱，用來區別session和cookie-->
     <add key="SC" value="erp17168" />
-<<<<<<< HEAD
     <add key="LogPath" value="D:\\log\\" />
 	<!--是否啟用信眾自動編號 (true=啟用, false=停用)-->
 	<add key="IsAutoNumbering" value="true" />
-=======
-    <!--是否啟用信眾自動編號 (true=啟用, false=停用)-->
-    <add key="IsAutoNumbering" value="true" />
->>>>>>> 0.1
   </appSettings>
   <connectionStrings>
     <!--SQL用-->