change merging strategy

scalableminds · Feb 3, 2016 · 17f81d6 · 17f81d6
1 parent d7ee158
commit 17f81d6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/project/Build.scala b/project/Build.scala
@@ -47,7 +47,7 @@ object ApplicationBuild extends Build with sbtassembly.AssemblyKeys {
       case PathList("javax", "mail", xs @ _*)                                  => MergeStrategy.first
       case PathList("javax", "activation", xs @ _*)                            => MergeStrategy.first
       case PathList(ps @ _*) if ps.last endsWith ".html"                       => MergeStrategy.first
-      case PathList("org", "apache", xs @ _*)                                  => MergeStrategy.first
+      case PathList("org", "apache", "commons", "logging", xs @ _*)            => MergeStrategy.first
       case PathList("play", "core", "server", xs @ _*)                         => MergeStrategy.first
       case "log4j.properties"                                                  => MergeStrategy.concat
       case "unwanted.txt"                                                      => MergeStrategy.discard