From 17480b5b82744f4c74b61a2f1e4e5ea780ccc3ff Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期三, 27 十一月 2024 13:45:25 +0800
Subject: [PATCH] 修复冲突

---
 .gitignore |   42 ++++++++++++------------------------------
 1 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index a0b9717..e79e3bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,34 +1,16 @@
-node_modules
-.DS_Store
-.github
-dist
-.npmrc
-.cache
+## ide
+**/.idea
+*.iml
+rebel.xml
 
-tests/server/static
-tests/server/static/upload
+## backend
+**/target
+**/logs
 
-.local
-# local env files
-.env.local
-.env.*.local
-.eslintcache
+## front
+**/*.lock
 
-# Log files
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
 
-# Editor directories and files
-.idea
-# .vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
-/os_del.cmd
-/.vscode/
-/.history/
-/svn clear.bat
+/target/
+**/target
+**/logs

--
Gitblit v1.9.3