From 20fcd1d8d35824e8ffa81596e537957566e1fa0d Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 31 三月 2021 18:03:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 .gitignore |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index d8ecff1..cc27dc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,10 +26,7 @@
 
 # Users Environment Variables
 .lock-wscript
-
+.DS_Store
 package-lock.json
-/.idea/modules.xml
-/.idea/inspectionProfiles/Project_Default.xml
-/.idea/SewerAndRainNetwork.iml
-/.idea/vcs.xml
-/.idea/workspace.xml
+.idea
+.dist

--
Gitblit v1.8.0