merged with master

2010-09-13 13:50:31 +02:00 · 2010-09-13 13:50:31 +02:00 · 107771961b
commit 107771961b
parent 3d2af5f925
1 changed files with 0 additions and 1 deletions
--- 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")