From 107771961bd98aa51e69520fd7562d34d3a869e7 Mon Sep 17 00:00:00 2001 From: Michael Kober Date: Mon, 13 Sep 2010 13:50:31 +0200 Subject: [PATCH] merged with master --- akka-spring/src/test/scala/UntypedActorSpringFeatureTest.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/akka-spring/src/test/scala/UntypedActorSpringFeatureTest.scala b/akka-spring/src/test/scala/UntypedActorSpringFeatureTest.scala index 67ab6398a6..0397d30bf0 100644 --- a/akka-spring/src/test/scala/UntypedActorSpringFeatureTest.scala +++ b/akka-spring/src/test/scala/UntypedActorSpringFeatureTest.scala @@ -59,7 +59,6 @@ class UntypedActorSpringFeatureTest extends FeatureSpec with ShouldMatchers with feature("parse Spring application context") { -<<<<<<< HEAD scenario("get a untyped actor") { val myactor = getPingActorFromContext("/untyped-actor-config.xml", "simple-untyped-actor") myactor.sendOneWay("Hello")