67 lines
724 B
Plaintext
67 lines
724 B
Plaintext
<<<<<<< HEAD
|
|
# Eclipse stuff
|
|
.classpath
|
|
.project
|
|
.settings/
|
|
|
|
# netbeans
|
|
nbproject/
|
|
nbactions.xml
|
|
|
|
# we use maven!
|
|
build.xml
|
|
|
|
# maven
|
|
target/
|
|
dependency-reduced-pom.xml
|
|
|
|
# vim
|
|
.*.sw[a-p]
|
|
|
|
# various other potential build files
|
|
build/
|
|
bin/
|
|
dist/
|
|
manifest.mf
|
|
|
|
# Mac filesystem dust
|
|
.DS_Store/
|
|
.DS_Store
|
|
|
|
# intellij
|
|
*.iml
|
|
*.ipr
|
|
*.iws
|
|
.idea/
|
|
.idea
|
|
.idea\
|
|
|
|
working-dir/
|
|
*.xml
|
|
.idea/workspace.xml
|
|
=======
|
|
# 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*
|
|
>>>>>>> 6e4ff37e03486bd27d4884d80f78a2263cdf60ea
|