From c4c1e66403f8143bee2072442e36ab3be608741a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 九月 2023 11:35:33 +0800
Subject: [PATCH] Merge branch 'dev'

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

diff --git a/.gitignore b/.gitignore
index 5fc2201..cf1110b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *.class
-
+.idea/
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
@@ -12,6 +12,8 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
+log/
+.gitignore
 .DS_Store
 coderd.json
 node_modules
@@ -29,10 +31,9 @@
 pnpm-debug.log*
 
 # Editor directories and files
-.idea
 .vscode
 *.suo
 *.ntvs*
 *.njsproj
 *.sln
-*.sw?
\ No newline at end of file
+*.sw?

--
Gitblit v1.9.3