diff options
| author | Paul Phillips <paulp@improving.org> | 2012-04-13 02:39:39 +0100 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-04-13 02:39:39 +0100 |
| commit | b70c9317358753a14217f0014cbf53be67ccfd4a (patch) | |
| tree | ac15a76386fc2c2738375c1209d7320c53bf4bae /test/disabled/jvm/concurrent-future.check | |
| parent | feed1a12b886dc2c533f5e078d4c28c768dba6a6 (diff) | |
| parent | 225d205f83ceb7fc6f0af005f0085bf7ab493b38 (diff) | |
| download | scala-b70c9317358753a14217f0014cbf53be67ccfd4a.tar.gz scala-b70c9317358753a14217f0014cbf53be67ccfd4a.tar.bz2 scala-b70c9317358753a14217f0014cbf53be67ccfd4a.zip | |
Merge commit 'refs/pull/383/head' into develop
Diffstat (limited to 'test/disabled/jvm/concurrent-future.check')
| -rw-r--r-- | test/disabled/jvm/concurrent-future.check | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/test/disabled/jvm/concurrent-future.check b/test/disabled/jvm/concurrent-future.check index c55e824818..715ac90ce7 100644 --- a/test/disabled/jvm/concurrent-future.check +++ b/test/disabled/jvm/concurrent-future.check @@ -12,5 +12,3 @@ test6: hai world test6: kthxbye test7: hai world test7: kthxbye -test8: hai world -test8: im in yr loop |