From 849a9907e793fed3bb18df542090e4a1f4e4f429 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期一, 28 八月 2023 11:58:55 +0800
Subject: [PATCH] 冲突

---
 .idea/.gitignore |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/.idea/.gitignore b/.idea/.gitignore
index 26d3352..7a58c58 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,3 +1,6 @@
 # Default ignored files
 /shelf/
 /workspace.xml
+/node_modules
+/admin
+/doumeeplant_admin
\ No newline at end of file

--
Gitblit v1.9.3