Merge branch 'main' of

https://gitrepo.62816222.work/carlynne/RestBoard.git into main
2026-10-21 12:04:00 +09:00
parent 4957998e3e 1b87f3e4bb
commit ca7af5c457
2 changed files with 32 additions and 0 deletions
@@ -1 +1,30 @@
+<<<<<<< HEAD
 /target/
+=======
+# ---> 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*
+
+>>>>>>> branch 'main' of https://gitrepo.62816222.work/carlynne/RestBoard.git