[infinispan-commits] Infinispan SVN: r1980 - trunk/server/rest/src/test/scala/org/infinispan/rest.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2010-07-06 04:45:13 -0400 (Tue, 06 Jul 2010)
New Revision: 1980

Modified:
   trunk/server/rest/src/test/scala/org/infinispan/rest/IntegrationTest.scala
Log:
Fix merge.

Modified: trunk/server/rest/src/test/scala/org/infinispan/rest/IntegrationTest.scala
===================================================================
--- trunk/server/rest/src/test/scala/org/infinispan/rest/IntegrationTest.scala	2010-07-06 08:34:52 UTC (rev 1979)
+++ trunk/server/rest/src/test/scala/org/infinispan/rest/IntegrationTest.scala	2010-07-06 08:45:13 UTC (rev 1980)
@@ -289,5 +289,5 @@
    /**These are needed for Jackson to Do Its Thing */
    def getName = name
 
-   def setName(s: String) r1875 through r1949= {name = s}
+   def setName(s: String) = {name = s}
 }
\ No newline at end of file