diff options
author | Josh Suereth <joshua.suereth@gmail.com> | 2011-11-23 14:14:34 -0500 |
---|---|---|
committer | Josh Suereth <joshua.suereth@gmail.com> | 2011-11-23 14:14:34 -0500 |
commit | 26aee7eb070ae35984be1d0c3d3b02d4909a6e26 (patch) | |
tree | 2448b2ee277b4a3bfd1df64e5b3e7eb02138ac32 /test/files/neg/t692.check | |
parent | b7b81ca286b1f426cd19befd50fbc513bb82282f (diff) | |
download | scala-26aee7eb070ae35984be1d0c3d3b02d4909a6e26.tar.gz scala-26aee7eb070ae35984be1d0c3d3b02d4909a6e26.tar.bz2 scala-26aee7eb070ae35984be1d0c3d3b02d4909a6e26.zip |
Added *.log and build/ to gitignore so partest/...
Added *.log and build/ to gitignore so partest/ant artifacts don't show
up in our commit messages. Also fixed whitespace issues arising from the
filter-branch history rewrite for git move.
Diffstat (limited to 'test/files/neg/t692.check')
-rw-r--r-- | test/files/neg/t692.check | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/neg/t692.check b/test/files/neg/t692.check index 12b7d40ba5..25dda7bd1b 100644 --- a/test/files/neg/t692.check +++ b/test/files/neg/t692.check @@ -11,7 +11,7 @@ t692.scala:13: error: class Foo takes type parameters case class BarType[T3 <: Foo](tpeT : RefType[T3]) extends ClassType[Bar[T3],Foo](FooType); ^ t692.scala:14: error: class Foo takes type parameters - implicit def typeOfBar[T4 <: Foo](implicit elem : RefType[T4]) : RefType[Bar[T4]] = + implicit def typeOfBar[T4 <: Foo](implicit elem : RefType[T4]) : RefType[Bar[T4]] = ^ t692.scala:15: error: type mismatch; found : test3.this.BarType[T4] |