+<<<<<<< HEAD
+# -*- mode: gitignore; -*-
+*~
+\#*\#
+.\#*
+=======
+>>>>>>> fb376f02820fc8dd8404759e2b45fa582969dc3e
*.pydevproject
.metadata
.gradle
.texlipse
# STS (Spring Tool Suite)
-.springBeans
\ No newline at end of file
+<<<<<<< HEAD
+.springBeans
+=======
+.springBeans
+>>>>>>> fb376f02820fc8dd8404759e2b45fa582969dc3e