From 79a0915196d77e1e4f13ad3b1b11f65eea52388f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 02 十二月 2024 16:16:40 +0800
Subject: [PATCH] Resolve merge conflict in .gitignore

---
 .gitignore |    6 ++++++
 README.md  |    4 ++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0ae3256..6cf689d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -168,3 +168,9 @@
 .idea/caches/build_file_checksums.ser
 *.iml
 .idea/
+
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..f8680a8
--- /dev/null
+++ b/README.md
@@ -0,0 +1,4 @@
+## YiFeiNN
+
+南宁医废
+

--
Gitblit v1.7.1