+<<<<<<< HEAD
+=======
# -*- mode: gitignore; -*-
*~
\#*\#
.\#*
+>>>>>>> c7a54f8e92507c36aeefbd99783e0811402b34b5
*.pydevproject
.metadata
.gradle
bin/
tmp/
+<<<<<<< HEAD
+=======
build/
dist/
sysProps.xml
+>>>>>>> c7a54f8e92507c36aeefbd99783e0811402b34b5
*.tmp
*.bak
*.swp
.texlipse
# STS (Spring Tool Suite)
+<<<<<<< HEAD
.springBeans
+=======
+.springBeans
+>>>>>>> c7a54f8e92507c36aeefbd99783e0811402b34b5