From 761e5c5fa871959f60e15c971c8d83f2b53d0af5 Mon Sep 17 00:00:00 2001
From: wangrong <wangrong@shsening.com>
Date: 星期日, 30 八月 2026 15:41:28 +0800
Subject: [PATCH] init

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

diff --git a/.gitignore b/.gitignore
index 947d74e..095b35a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Compiled class file
 *.class
 
@@ -7,12 +8,17 @@
 # BlueJ files
 *.ctxt
 
+=======
+*.class
+
+>>>>>>> cce85ae68e917f3422992c2e331347ed72b3cf22
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
 # Package Files #
 *.jar
 *.war
+<<<<<<< HEAD
 *.nar
 *.ear
 *.zip
@@ -52,3 +58,9 @@
 .vite/
 /core/backend/
 /classpath:substitule.json
+=======
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+>>>>>>> cce85ae68e917f3422992c2e331347ed72b3cf22

--
Gitblit v1.9.1