summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-01-29 12:40:16 -0800
committerJason Zaugg <jzaugg@gmail.com>2013-01-29 12:40:16 -0800
commitc1dd8bbaa4cc688ab05fc325a02e20b91488a583 (patch)
tree3dc5189c50167a515cf9f5392ffc3bcbcc0c295f
parenteff78b852e8b866badf9b9738f896c2a31c05474 (diff)
parentbffe776b2ad04d4ebadd2517345ffa0bc4d0723f (diff)
downloadscala-c1dd8bbaa4cc688ab05fc325a02e20b91488a583.tar.gz
scala-c1dd8bbaa4cc688ab05fc325a02e20b91488a583.tar.bz2
scala-c1dd8bbaa4cc688ab05fc325a02e20b91488a583.zip
Merge pull request #2010 from retronym/backport/1985
[backport] Disabled SI-6987.
-rw-r--r--test/disabled/run/t6987.check (renamed from test/files/run/t6987.check)0
-rw-r--r--test/disabled/run/t6987.scala (renamed from test/files/run/t6987.scala)0
2 files changed, 0 insertions, 0 deletions
diff --git a/test/files/run/t6987.check b/test/disabled/run/t6987.check
index 86fc96c679..86fc96c679 100644
--- a/test/files/run/t6987.check
+++ b/test/disabled/run/t6987.check
diff --git a/test/files/run/t6987.scala b/test/disabled/run/t6987.scala
index 37e91d61ae..37e91d61ae 100644
--- a/test/files/run/t6987.scala
+++ b/test/disabled/run/t6987.scala