From 7768b430fc3d9d22ae22ec987a34a4532a53f591 Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期一, 30 六月 2025 11:10:19 +0800 Subject: [PATCH] Resolve merger conflicts --- .gitignore | 15 +++++++++++++++ README.md | 9 ++++++++- 2 files changed, 23 insertions(+), 1 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 diff --git a/README.md b/README.md index 998475c..9796d1d 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +<<<<<<< HEAD <p align="center"> <img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png"> </p> @@ -92,4 +93,10 @@ ## 鑻ヤ緷鍓嶅悗绔垎绂讳氦娴佺兢 -QQ缇わ細 [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ 鐐瑰嚮鎸夐挳鍏ョ兢銆� \ No newline at end of file +QQ缇わ細 [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ 鐐瑰嚮鎸夐挳鍏ョ兢銆� +======= +## archiveSystem + + + +>>>>>>> 9a3621236cdb0d73ca5d9c8f658e004c2a1dc2ec -- Gitblit v1.9.1