.gitignore.orig

<<<<<<< HEAD
*.class
*.log

# sbt specific
.cache
.history
.lib/
dist/*
target/
lib_managed/
src_managed/
project/boot/
project/plugins/project/

# Scala-IDE specific
.scala_dependencies
.worksheet

# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion

*.iml

## Directory-based project format:
.idea/

## File-based project format:
*.ipr
*.iws

## Plugin-specific files:

# IntelliJ
/out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
=======
# made by sbt
target/

# made by eclipse
# you can create the eclipse project file by running `sbt eclipse`
.cache
.classpath
.project
.settings

# made by idea
# you can create the intellij idea project file by running `sbt gen-idea`
.idea
.idea_modules
>>>>>>> 4c79d84ae71b8c3a0b731b984c81e12d61c513ac