diff options
| author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-09-20 10:22:01 -0700 |
|---|---|---|
| committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-09-20 10:22:01 -0700 |
| commit | 45c0b2428219b6a00514e21529650b32631880b6 (patch) | |
| tree | 88eeb6ce02a1ec9dda21e77f7add4a995a8b9879 /test/files/jvm/scala-concurrent-tck.scala | |
| parent | 1fc89420688d2123615e89a15e515c801729be5a (diff) | |
| parent | 05367235ef4c519521cb28073f951e3d55fe3aad (diff) | |
| download | scala-45c0b2428219b6a00514e21529650b32631880b6.tar.gz scala-45c0b2428219b6a00514e21529650b32631880b6.tar.bz2 scala-45c0b2428219b6a00514e21529650b32631880b6.zip | |
Merge pull request #1339 from rkuhn/wip-6389-finite-duration-mult
enable integer multiplication/divison on FiniteDuration, see SI-6389
Diffstat (limited to 'test/files/jvm/scala-concurrent-tck.scala')
| -rw-r--r-- | test/files/jvm/scala-concurrent-tck.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/jvm/scala-concurrent-tck.scala b/test/files/jvm/scala-concurrent-tck.scala index 0e76b711de..b529bca38a 100644 --- a/test/files/jvm/scala-concurrent-tck.scala +++ b/test/files/jvm/scala-concurrent-tck.scala @@ -10,7 +10,7 @@ import scala.concurrent.{ } import scala.concurrent.{ future, promise, blocking } import scala.util.{ Try, Success, Failure } -import scala.concurrent.util.Duration +import scala.concurrent.duration.Duration import scala.reflect.{ classTag, ClassTag } import scala.tools.partest.TestUtil.intercept |