<<<<<<< HEAD ======= # -*- mode: gitignore; -*- *~ \#*\# .\#* >>>>>>> c7a54f8e92507c36aeefbd99783e0811402b34b5 *.pydevproject .metadata .gradle bin/ tmp/ <<<<<<< HEAD ======= build/ dist/ sysProps.xml >>>>>>> c7a54f8e92507c36aeefbd99783e0811402b34b5 *.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 >>>>>>> c7a54f8e92507c36aeefbd99783e0811402b34b5