From 392b92137a2af9dd941817c3a97f5baeb2cefa84 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期日, 04 二月 2024 16:13:06 +0800
Subject: [PATCH] Mr.Shi

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

diff --git a/.gitignore b/.gitignore
index b7e867f..afe737f 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,14 +8,11 @@
 *.war
 *.ear
 
-<<<<<<< HEAD
 target/
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
 .DS_Store
 coderd.json
-node_modules
 /dist
 
 
@@ -41,7 +33,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