From f0aac7e028b09aefa2428a8d66fdb81e466a89fe Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期三, 19 十一月 2025 15:35:52 +0800
Subject: [PATCH] 修改了对应代码

---
 .gitignore |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index ed8368a..c196823 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ######################################################################
 # Build Tools
 
@@ -45,3 +46,17 @@
 !*/build/*.java
 !*/build/*.html
 !*/build/*.xml
+=======
+*.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*
+>>>>>>> 9a3621236cdb0d73ca5d9c8f658e004c2a1dc2ec

--
Gitblit v1.9.1