Catching up with master

2011-12-30 19:06:16 +01:00 · 2011-12-30 19:06:16 +01:00 · 1dc981725d
commit 1dc981725d
parent 31fba01ba2 f76e085226
12 changed files with 224 additions and 94 deletions
--- a/akka-docs/scala/code/akka/docs/future/FutureDocSpec.scala
+++ b/akka-docs/scala/code/akka/docs/future/FutureDocSpec.scala
@ -70,8 +70,6 @@ class FutureDocSpec extends AkkaSpec {
    import akka.dispatch.Future
    import akka.util.duration._

-    implicit def dispatcher = system.dispatcher
-
    val future = Future {
      "Hello" + "World"
    }