diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-09-03 08:22:51 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-09-03 08:22:51 +1000 |
commit | 21644611b3c676210d312eca1e0169d21070b50e (patch) | |
tree | e732aa1f0b6b6d65c21e91b40298f722200593f7 /test/files/jvm/interpreter.check | |
parent | 61dbf4ac711094db38a4b2dfb853d88499c2b1a5 (diff) | |
parent | 91c4192c39d2bdebf37a97e41d374a39ece8af85 (diff) | |
download | scala-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/interpreter.check')
-rw-r--r-- | test/files/jvm/interpreter.check | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/jvm/interpreter.check b/test/files/jvm/interpreter.check index d124794e72..d03edb638c 100644 --- a/test/files/jvm/interpreter.check +++ b/test/files/jvm/interpreter.check @@ -361,7 +361,7 @@ It would fail on the following inputs: Exp(), Term() ^ f: (e: Exp)Int -scala> +scala> :quit plusOne: (x: Int)Int res0: Int = 6 res0: String = after reset |