From f6e2c7d08bb4f29f38a77b9f789c6d7a47d5bebe Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期五, 14 五月 2021 11:20:10 +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..3ba1c88 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