From 153da1eef16b51d75442779a3964a1c5413132e4 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期五, 19 八月 2022 10:54:56 +0800
Subject: [PATCH] 冲突

---
 DAL/IStation.DAL4Epanet/EpanetFile.cs |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/DAL/IStation.DAL4Epanet/EpanetFile.cs b/DAL/IStation.DAL4Epanet/EpanetFile.cs
index 8fb6a62..8ba4b3d 100644
--- a/DAL/IStation.DAL4Epanet/EpanetFile.cs
+++ b/DAL/IStation.DAL4Epanet/EpanetFile.cs
@@ -19,7 +19,6 @@
             get { return ConfigHelper.DefaultConnectionConfig; }
         }
 
-
         /// <summary>
         /// 閫氳繃 BelongType 鍜� BelongID 鑾峰彇
         /// </summary>

--
Gitblit v1.9.3