解决合并冲突

2023-09-04 18:32:08 +08:00
parent 67450371b9 f02ae348c7
commit 8d7df832c1
3 changed files with 45 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ### IntelliJ IDEA ###
 out/
 !**/src/main/**/out/
@@ -26,4 +27,33 @@ bin/
 .vscode/

 ### Mac OS ###
-.DS_Store
+.DS_Store
+=======
+# ---> Java
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
+
+>>>>>>> gitea/master
+idea/