aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJakob Odersky <jodersky@gmail.com>2015-04-03 11:30:24 +0200
committerJakob Odersky <jodersky@gmail.com>2015-04-03 11:30:24 +0200
commite144f8a38ba869372ef9aa5936608f619bb6092a (patch)
treef4142378cb47351c086873cba7eb21a0c561bad0 /.gitignore
parenta421fe89421a8e5a53b43eeef3a9ca5e2aba0ec6 (diff)
downloadmavigator-e144f8a38ba869372ef9aa5936608f619bb6092a.tar.gz
mavigator-e144f8a38ba869372ef9aa5936608f619bb6092a.tar.bz2
mavigator-e144f8a38ba869372ef9aa5936608f619bb6092a.zip
consolidate .gitignore
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore17
1 files changed, 7 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index 7a55893..22973af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
# sbt
-.cache
-.history/
+.history
.lib/
dist/*
target/
@@ -10,12 +9,11 @@ project/boot/
project/plugins/project/
# scala-ide specific
-/.settings
-/.scala_dependencies
-/.project
-/.classpath
-/.cache
-/.history
+.settings
+.scala_dependencies
+.project
+.classpath
+.cache
# ensime
.ensime
@@ -26,5 +24,4 @@ project/plugins/project/
*.class
*.log
*~
-/.idea
-
+.idea