summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2006-06-23 10:33:09 +0000
committerPhilipp Haller <hallerp@gmail.com>2006-06-23 10:33:09 +0000
commit4642751e0eb113aadc28544db85ca69b9c0c1606 (patch)
treece179dd2958cce4fdbe9ef19444c79dd369f3b2d /docs
parent48dd2c26dd15a2b21f7c53d04d508e9658a90e38 (diff)
downloadscala-4642751e0eb113aadc28544db85ca69b9c0c1606.tar.gz
scala-4642751e0eb113aadc28544db85ca69b9c0c1606.tar.bz2
scala-4642751e0eb113aadc28544db85ca69b9c0c1606.zip
Resolved conflict in actor example.
Diffstat (limited to 'docs')
-rw-r--r--docs/examples/actors/counter.scala1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/examples/actors/counter.scala b/docs/examples/actors/counter.scala
index 9af8eba243..1224853432 100644
--- a/docs/examples/actors/counter.scala
+++ b/docs/examples/actors/counter.scala
@@ -37,6 +37,7 @@ class CounterUser extends RemoteActor {
val host = java.net.InetAddress.getLocalHost().getHostAddress()
spawn(TcpNode(host, 9090), classOf[Counter].getName())
+
receive {
case p: Pid =>
// communicate with counter