diff options
author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2012-10-03 16:25:42 +0200 |
---|---|---|
committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2012-10-03 16:25:42 +0200 |
commit | 9b2154e43a8a138e561a004ccab85660d3c0b4dd (patch) | |
tree | a271163aa9d6a9c79b1d5f03297bc9296b101fb8 /test/files/jvm/actmig-public-methods.scala | |
parent | d85224b3a1b0884172ee6985b643a2dda49094d6 (diff) | |
parent | 5b9af1b9ff327e8efa2c8b6e8b9ed8d3cdf2598e (diff) | |
download | scala-9b2154e43a8a138e561a004ccab85660d3c0b4dd.tar.gz scala-9b2154e43a8a138e561a004ccab85660d3c0b4dd.tar.bz2 scala-9b2154e43a8a138e561a004ccab85660d3c0b4dd.zip |
Merge remote-tracking branch 'scala/2.10.x'
Conflicts:
build.number
src/reflect/scala/reflect/internal/Types.scala
Diffstat (limited to 'test/files/jvm/actmig-public-methods.scala')
-rw-r--r-- | test/files/jvm/actmig-public-methods.scala | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/files/jvm/actmig-public-methods.scala b/test/files/jvm/actmig-public-methods.scala index 58d7a1a9d4..8891c80668 100644 --- a/test/files/jvm/actmig-public-methods.scala +++ b/test/files/jvm/actmig-public-methods.scala @@ -5,7 +5,6 @@ import scala.collection.mutable.ArrayBuffer import scala.actors.Actor._ import scala.actors._ -import scala.actors.migration.MigrationSystem import scala.util.continuations._ import java.util.concurrent.{ TimeUnit, CountDownLatch } @@ -71,4 +70,4 @@ object Test { buff.sorted.foreach(println) toStop.foreach(_ ! 'stop) } -}
\ No newline at end of file +} |