raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

merged with upstream

Browse source
This commit is contained in:
Jonas Bonér 2010-05-02 10:46:49 +02:00
commit 388b52b58f
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-core/src/main/scala/stm/DataFlowVariable.scala
View file

@ -97,7 +97,11 @@ import se.scalablesolutions.akka.dispatch.CompletableFuture
}
}
<<<<<<< HEAD:akka-core/src/main/scala/stm/DataFlowVariable.scala
private[this] val in = new ActorID(() => new In(this))
=======
private[this] val in = new ActorID(new In(this))
>>>>>>> bac0db9650a62204e6dabf4d195a9875047067f5:akka-core/src/main/scala/stm/DataFlowVariable.scala
def <<(ref: DataFlowVariable[T]) = in ! Set(ref())