summaryrefslogtreecommitdiff
path: root/test/files/res
diff options
context:
space:
mode:
Diffstat (limited to 'test/files/res')
-rw-r--r--test/files/res/bug687.check5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/files/res/bug687.check b/test/files/res/bug687.check
index 353101c38b..ee9520d1ea 100644
--- a/test/files/res/bug687.check
+++ b/test/files/res/bug687.check
@@ -1,10 +1,11 @@
+
nsc>
-nsc>
-bug687/QueryB.scala:3: error: name clash between defined and inherited member:
+nsc> bug687/QueryB.scala:3: error: name clash between defined and inherited member:
method equals:(o: java.lang.Object)Boolean and
method equals:(x$1: Any)Boolean in class Any
have same type after erasure: (o: java.lang.Object)Boolean
override def equals(o : Object) = false;
^
+
nsc>
nsc>