From 0e8ad86aa1f3bb3f05cc1efba205cab0fc5d1ba5 Mon Sep 17 00:00:00 2001
From: Philipp Haller <hallerp@gmail.com>
Date: Thu, 17 May 2007 11:49:08 +0000
Subject: resolved conflict

---
 src/actors/scala/actors/Actor.scala | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/actors/scala/actors/Actor.scala b/src/actors/scala/actors/Actor.scala
index f65ec526c4..6e3179113c 100644
--- a/src/actors/scala/actors/Actor.scala
+++ b/src/actors/scala/actors/Actor.scala
@@ -617,8 +617,14 @@ trait Actor extends OutputChannel[Any] {
     this
   }
 
-  def loop(body: => Unit): Nothing =
+  /**
+   * Repeatedly execute <code>body</code>.
+   *
+   * @param body the code block to be executed
+   */
+  /*def loop(body: => Unit): Nothing = {
     Actor.seq(body, loop(body))
+  }*/
 
   private[actors] var links: List[Actor] = Nil
 
-- 
cgit v1.2.3