<<<<<<< HEAD
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
target/
javaSource/
/.idea
.project
.classpath
.settings/
.metadata
*.classpath
*.project
target/
.apt_generated/
.apt_generated_tests/
.factorypath
.metadata/
.recommenders/
logs/
.log
.springBeans
.mvn/
.svn/
mvnw
mvnw.cmd
*.bak
.idea/
*.iml
.sts4-cache/
.yml
/ovep-server/ovep-boot/application.yml
=======
.metadata
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.settings
.loadpath
.recommenders
.classpath
.project
.class

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# PyDev specific (Python IDE for Eclipse)
*.pydevproject

# CDT-specific (C/C++ Development Tooling)
.cproject

# CDT- autotools
.autotools

# Java annotation processor (APT)
.factorypath

# PDT-specific (PHP Development Tools)
.buildpath

# sbteclipse plugin
.target

# Tern plugin
.tern-project

# TeXlipse plugin
.texlipse

# STS (Spring Tool Suite)
.springBeans

# Code Recommenders
.recommenders/

# Annotation Processing
.apt_generated/

# Scala IDE specific (Scala & Java development for Eclipse)
.cache-main
.scala_dependencies
.worksheet
>>>>>>> f162496d9df3d149d7f3a67deffb68123e3a9abb