Merge pull request #319 from adrianbn/master

Add support for merging reference-overrides.conf as config
sbt · May 5, 2018 · 08d6653 · 08d6653
2 parents 8dee0de + 1651997
commit 08d6653
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/scala/sbtassembly/Assembly.scala b/src/main/scala/sbtassembly/Assembly.scala
@@ -46,7 +46,7 @@ object Assembly {
 
         Using.fileOutputStream(true)(outPath) { out => IO.transfer(tmpFile, out) }
         tmpFile.delete()
-        
+
         try {
           sys.process.Process("chmod", Seq("+x", outPath.toString)).!
         }
@@ -274,7 +274,7 @@ object Assembly {
 
   def isConfigFile(fileName: String): Boolean =
     fileName.toLowerCase match {
-      case "reference.conf" | "application.conf" | "rootdoc.txt" | "play.plugins" => true
+      case "reference.conf" | "reference-overrides.conf" | "application.conf" | "rootdoc.txt" | "play.plugins" => true
       case _ => false
     }