From 97a7d4a2a256b9171bca05e69d154996645b4722 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 16 三月 2021 10:29:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

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

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

--
Gitblit v1.8.0