From e144f8a38ba869372ef9aa5936608f619bb6092a Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jodersky@gmail.com>
Date: Fri, 3 Apr 2015 11:30:24 +0200
Subject: consolidate .gitignore

---
 .gitignore | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to '.gitignore')

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
-- 
cgit v1.2.3