Josh Rosen 039b41cb54 Use sbt mergeStrategy for reference.conf files. ... Cleans up #158 / 509b721.		2012-08-02 10:21:50 -07:00
..
project	Use new layout for plugins definitions (recommended for SBT 0.11)	2011-09-26 22:32:05 +01:00
build.properties	Update SBT and SBT-Eclipse version	2012-06-17 14:37:18 -07:00
plugins.sbt	Various code style fixes, mostly from IntelliJ IDEA	2012-06-29 18:47:12 -07:00
SparkBuild.scala	Use sbt mergeStrategy for reference.conf files.	2012-08-02 10:21:50 -07:00