From 564d0ab88c6ddf0b3d56a9eeba5ee72d6fff01b9 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 07 四月 2021 15:33:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 .gitignore |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 928aba2..cc27dc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,8 +28,5 @@
 .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