.gitignore

<<<<<<< HEAD
*.class

# Package Files #
*.jar
*.war
*.ear
=======
# build directories and files
#hg syntax
target/**.*
#git syntax
target/
**/build/*
build/*
*.pyc

# Maven
release.properties

#Eclipse
.settings/*.**
**/.settings/*.**
.classpath
.project
**/.externalToolBuilders/*.**

# Netbeans
nb-configuration.xml
nbactions.xml
nbproject

# Intellij
*.iml
*.ipr
*.iws
.idea/

# Backup files left behind by the Emacs editor.
*~
# Lock files used by the Emacs editor.
.\#*
# Temporary files used by TestMate
._*
# XCode user data
**.pbxuser
**.mode?v?
**.perspectivev?
# documentation
**.docset/*
# for those crazies using svn and hg at the same time
*.svn*

# Random OS stuff
.DS_Store
Thumbs.db
*.log

# temporary folders
syntax: regexp
.*/te?mp/.*
# Temporary files used by the vim editor.
.*.swp
/.metadata
>>>>>>> 4e4233a4ea9bfca4536454a34b52a7f41e3f04b7