Resolve merge conflict with master

2011-09-19 19:00:58 +02:00 · 2011-09-19 19:00:58 +02:00 · f9e23c3102
commit f9e23c3102
parent b66d45ec6c 5a9b6b1816
98 changed files with 480 additions and 546 deletions
--- a/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala
+++ b/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala
@ -40,7 +40,7 @@ object Pi extends App {

    def receive = {
      case Work(start, nrOfElements) ⇒
-        self reply Result(calculatePiFor(start, nrOfElements)) // perform the work
+        reply(Result(calculatePiFor(start, nrOfElements))) // perform the work
    }
  }