From 6a90b2d87cf32bdc2fdafb96e979e7b9cfdebb40 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 01 二月 2024 19:23:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/.gitignore b/.gitignore
index b7e867f..8582c46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,6 @@
-<<<<<<< HEAD
 git*.class
 .idea/
-=======
 *.class
-
->>>>>>> 2845789016bdae401d55b7d4f857f344d80c5c50
-# Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
 # Package Files #
@@ -13,9 +8,7 @@
 *.war
 *.ear
 
-<<<<<<< HEAD
 target/
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
 .DS_Store
@@ -41,7 +34,4 @@
 *.njsproj
 *.sln
 *.sw?
-=======
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
->>>>>>> 2845789016bdae401d55b7d4f857f344d80c5c50

--
Gitblit v1.9.3