Merge pull request #1996 from tonylotts/master

author Brendan Forster <brendan@github.com>

Thu, 2 Feb 2017 10:13:13 +0000 (11:13 +0100)

committer GitHub <noreply@github.com>

Thu, 2 Feb 2017 10:13:13 +0000 (11:13 +0100)
author Brendan Forster <brendan@github.com>
Thu, 2 Feb 2017 10:13:13 +0000 (11:13 +0100)
committer GitHub <noreply@github.com>
Thu, 2 Feb 2017 10:13:13 +0000 (11:13 +0100)
diff --cc Scala.gitignore

index a02d882cb88407d93f96cc647944b17408dcec7f,472100147c172515d489baac2770f7a97f8e6d97..006a7b247fefe09936ffddd7da25b1a042237a8f
--- 1/Scala.gitignore
--- 2/Scala.gitignore
+++ b/Scala.gitignore
@@@ -13,9 -13,7 +13,11 @@@ project/boot
   project/plugins/project/
   
   # Scala-IDE specific
+ .ensime
+ .ensime_cache/
   .scala_dependencies
   .worksheet
+ +
+ +# ENSIME specific
+ +.ensime_cache/
+ +.ensime
author	Brendan Forster <brendan@github.com>
	Thu, 2 Feb 2017 10:13:13 +0000 (11:13 +0100)
committer	GitHub <noreply@github.com>
	Thu, 2 Feb 2017 10:13:13 +0000 (11:13 +0100)