From e76f0739e647fe8a7e0e2618914e2faff554b1b7 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 17 十一月 2025 17:33:23 +0800
Subject: [PATCH] 解决冲突

---
 .gitignore |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4dfd109..8cb5595 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # 蹇界暐鎵�鏈夋ā鍧楃殑target鐩綍锛堥�掑綊鍖归厤鎵�鏈夊瓙鐩綍锛�
 **/target/
 # 蹇界暐target鐩綍涓嬬殑鎵�鏈夋枃浠讹紙闃叉閬楁紡锛�
@@ -9,4 +10,18 @@
 **/.idea/
 **/*.iml
 **/.classpath
-**/.project
\ No newline at end of file
+**/.project
+=======
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+>>>>>>> 595aa908e596cfc3ba605fe9afd5ca2e7d0a4901

--
Gitblit v1.8.0