diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-02-02 11:13:23 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-02-02 11:13:23 +1000 |
| commit | 70f960cfd1d43ee1b873c22a471c8350a966b2a7 (patch) | |
| tree | 99be5b41a9b55236ef2abb9e6978a90eb12184a8 /test/pending/jvm/cf-attributes.scala | |
| parent | 8b5f2b435b4b14089806406c8923f7e845d10ef6 (diff) | |
| parent | 41766537c03e5ed953cc806c2a8629b115097996 (diff) | |
| download | scala-70f960cfd1d43ee1b873c22a471c8350a966b2a7.tar.gz scala-70f960cfd1d43ee1b873c22a471c8350a966b2a7.tar.bz2 scala-70f960cfd1d43ee1b873c22a471c8350a966b2a7.zip | |
Merge pull request #4272 from retronym/merge/2.11.x-to-2.12.x-20150129
Merge 2.11.x to 2.12.x
Diffstat (limited to 'test/pending/jvm/cf-attributes.scala')
| -rw-r--r-- | test/pending/jvm/cf-attributes.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/pending/jvm/cf-attributes.scala b/test/pending/jvm/cf-attributes.scala index f4964b63b1..2d08f22d8b 100644 --- a/test/pending/jvm/cf-attributes.scala +++ b/test/pending/jvm/cf-attributes.scala @@ -62,7 +62,7 @@ object anonymousClasses { //InnerClass: // public final #_; //class anonymousClasses$$anon$1 of class anonymousClasses$ val x = new Foo() { - override def foo() { println("foo (overriden)"); } + override def foo() { println("foo (overridden)"); } def dummy = 0 } } |