From cf9b836069e0a76571c6611642b2d7abb0586a2b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 九月 2023 18:20:40 +0800
Subject: [PATCH] 解决冲突

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

diff --git a/.gitignore b/.gitignore
index 5fc2201..da635d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *.class
-
+.idea/
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
@@ -29,7 +29,6 @@
 pnpm-debug.log*
 
 # Editor directories and files
-.idea
 .vscode
 *.suo
 *.ntvs*

--
Gitblit v1.9.3