diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-07-13 08:42:11 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-07-13 11:45:02 +1000 |
| commit | 18e3e61778918e4e802b8fb75789635409523372 (patch) | |
| tree | 18d67da301f0b63667e9393d3e336b1fcb5e1875 /test/files/run/t9170.scala | |
| parent | b92c3aff1ab8c76c4816bd7b1a82a0f87d787837 (diff) | |
| parent | 52fde52920d93325310e5544991feeea03e5c763 (diff) | |
| download | scala-18e3e61778918e4e802b8fb75789635409523372.tar.gz scala-18e3e61778918e4e802b8fb75789635409523372.tar.bz2 scala-18e3e61778918e4e802b8fb75789635409523372.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20150713
Conflicts:
src/eclipse/partest/.classpath
src/eclipse/repl/.classpath
test/files/run/nothingTypeNoFramesNoDce.scala
test/files/run/repl-javap-app.check
Also fixup two .classpath files with updated partest, xml and
parser combinators JARs.
Diffstat (limited to 'test/files/run/t9170.scala')
| -rw-r--r-- | test/files/run/t9170.scala | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/test/files/run/t9170.scala b/test/files/run/t9170.scala index 67a58d6803..d6cf516615 100644 --- a/test/files/run/t9170.scala +++ b/test/files/run/t9170.scala @@ -6,9 +6,7 @@ object Test extends SessionTest { override def stripMargins = false def session = -"""Type in expressions to have them evaluated. -Type :help for more information. - +""" scala> object Y { def f[A](a: => A) = 1 ; def f[A](a: => Either[Exception, A]) = 2 } <console>:10: error: double definition: def f[A](a: => A): Int at line 10 and |