36 lines
398 B
Plaintext
36 lines
398 B
Plaintext
<<<<<<< HEAD
|
|
logs
|
|
project/project
|
|
project/target
|
|
target
|
|
tmp
|
|
.history
|
|
dist
|
|
/.idea
|
|
/*.iml
|
|
/out
|
|
/.idea_modules
|
|
/.classpath
|
|
/.project
|
|
/RUNNING_PID
|
|
/.settings
|
|
=======
|
|
*.class
|
|
*.log
|
|
|
|
# sbt specific
|
|
.cache/
|
|
.history/
|
|
.lib/
|
|
dist/*
|
|
target/
|
|
lib_managed/
|
|
src_managed/
|
|
project/boot/
|
|
project/plugins/project/
|
|
|
|
# Scala-IDE specific
|
|
.scala_dependencies
|
|
.worksheet
|
|
>>>>>>> d77c7a5704134269f77e334496b50cc1eaf9100c
|