Merging everything from the 2.8.x development b...

Merging everything from the 2.8.x development branch back to trunk.

- If you were working on trunk, please keep working on trunk If you were
- working on 2.8-devel, please switch to trunk now

1 files changed, 2 insertions, 2 deletions

diff --git a/test/files/neg/bug521.check b/test/files/neg/bug521.check
index b85e26677b..eda06ff9f6 100644
--- a/test/files/neg/bug521.check
+++ b/test/files/neg/bug521.check
@@ -1,14 +1,14 @@
 bug521.scala:10: error: class PlainFile needs to be abstract, since method path in class AbstractFile of type => String is not defined
 class PlainFile(val file : File) extends AbstractFile {}
       ^
-bug521.scala:13: error: error overriding value file in class PlainFile of type java.io.File;
+bug521.scala:13: error: overriding value file in class PlainFile of type java.io.File;
  value file needs `override' modifier
 final class ZipArchive(val file : File, archive : ZipFile) extends PlainFile(file) {
                            ^
 bug521.scala:13: error: class ZipArchive needs to be abstract, since method path in class AbstractFile of type => String is not defined
 final class ZipArchive(val file : File, archive : ZipFile) extends PlainFile(file) {
             ^
-bug521.scala:15: error: error overriding value path in class VirtualFile of type String;
+bug521.scala:15: error: overriding value path in class VirtualFile of type String;
  method path is not stable
     override def path = "";
                  ^