Merge branch 'main' of
https://gitrepo.62816222.work/carlynne/RestBoard.git into main
This commit is contained in:
+29
@@ -1 +1,30 @@
|
|||||||
|
<<<<<<< HEAD
|
||||||
/target/
|
/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
|
||||||
|
|||||||
Reference in New Issue
Block a user