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/future-spec/main.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/future-spec/main.scala')
| -rw-r--r-- | test/files/jvm/future-spec/main.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/jvm/future-spec/main.scala b/test/files/jvm/future-spec/main.scala index 57183d8cea..90048ccda0 100644 --- a/test/files/jvm/future-spec/main.scala +++ b/test/files/jvm/future-spec/main.scala @@ -3,7 +3,7 @@ import scala.collection._ import scala.concurrent._ -import scala.concurrent.util.Duration +import scala.concurrent.duration.Duration import java.util.concurrent.{ TimeoutException, CountDownLatch, TimeUnit } |