<<<<<<< HEAD # -*- mode: gitignore; -*- *~ \#*\# .\#* ======= >>>>>>> fb376f02820fc8dd8404759e2b45fa582969dc3e *.pydevproject .metadata .gradle bin/ tmp/ build/ dist/ sysProps.xml *.tmp *.bak *.swp *~.nib local.properties .settings/ .loadpath # Eclipse Core .project # External tool builders .externalToolBuilders/ # Locally stored "Eclipse launch configurations" *.launch # CDT-specific .cproject # JDT-specific (Eclipse Java Development Tools) .classpath # Java annotation processor (APT) .factorypath # PDT-specific .buildpath # sbteclipse plugin .target # TeXlipse plugin .texlipse # STS (Spring Tool Suite) <<<<<<< HEAD .springBeans ======= .springBeans >>>>>>> fb376f02820fc8dd8404759e2b45fa582969dc3e