summaryrefslogtreecommitdiff
path: root/test/files/jvm/throws-annot-from-java.check
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-09-03 08:22:51 +1000
committerJason Zaugg <jzaugg@gmail.com>2014-09-03 08:22:51 +1000
commit21644611b3c676210d312eca1e0169d21070b50e (patch)
treee732aa1f0b6b6d65c21e91b40298f722200593f7 /test/files/jvm/throws-annot-from-java.check
parent61dbf4ac711094db38a4b2dfb853d88499c2b1a5 (diff)
parent91c4192c39d2bdebf37a97e41d374a39ece8af85 (diff)
downloadscala-21644611b3c676210d312eca1e0169d21070b50e.tar.gz
scala-21644611b3c676210d312eca1e0169d21070b50e.tar.bz2
scala-21644611b3c676210d312eca1e0169d21070b50e.zip
Merge pull request #3959 from lrytz/merge/2.11-to-2.12-is-it-really-sept-2-already-where-was-summer
Merge 2.11 to 2.12
Diffstat (limited to 'test/files/jvm/throws-annot-from-java.check')
-rw-r--r--test/files/jvm/throws-annot-from-java.check2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/jvm/throws-annot-from-java.check b/test/files/jvm/throws-annot-from-java.check
index be3ba412f8..c541b26fcc 100644
--- a/test/files/jvm/throws-annot-from-java.check
+++ b/test/files/jvm/throws-annot-from-java.check
@@ -44,4 +44,4 @@ bar
tp.typeParams.isEmpty: true
throws[test.PolymorphicException[_]](classOf[test.PolymorphicException])
-scala>
+scala> :quit