diff options
author | Paul Phillips <paulp@improving.org> | 2012-03-14 12:27:53 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-03-14 12:27:53 -0700 |
commit | a127aae2a5fbae146ea81e470541209436222970 (patch) | |
tree | 75b8a7d3362896fd6562eac321b239326296b48a /test/files/run/repl-parens.check | |
parent | 0c9ffe55c774de261d32f36cc29b954638e86574 (diff) | |
parent | 5b562d4e7e451156236b48b3591db980a5691f8d (diff) | |
download | scala-a127aae2a5fbae146ea81e470541209436222970.tar.gz scala-a127aae2a5fbae146ea81e470541209436222970.tar.bz2 scala-a127aae2a5fbae146ea81e470541209436222970.zip |
Merge branch 'merge-inline' of /scratch/trunk3 into develop
Diffstat (limited to 'test/files/run/repl-parens.check')
-rw-r--r-- | test/files/run/repl-parens.check | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/run/repl-parens.check b/test/files/run/repl-parens.check index 944846541f..69f0a9ce30 100644 --- a/test/files/run/repl-parens.check +++ b/test/files/run/repl-parens.check @@ -66,7 +66,7 @@ scala> 55 ; () => 5 res13: () => Int = <function0> scala> () => { class X ; new X } -res14: () => Object with ScalaObject = <function0> +res14: () => Object = <function0> scala> |