summaryrefslogtreecommitdiff
path: root/test/files/neg/macro-override-macro-overrides-abstract-method-b.check
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-09-20 14:07:01 -0700
committerPaul Phillips <paulp@improving.org>2012-09-20 14:07:01 -0700
commitcc6f5f97f8a4290391a69ac96f134cb3e8ed4381 (patch)
treef2aa4f428719b7a8c8afd9959161f43b26a2c06d /test/files/neg/macro-override-macro-overrides-abstract-method-b.check
parentc8e6f8e64c4d9967cee41486cc2e324da0262976 (diff)
parent08de8afde6c99fb1739eb9730e6fce4eef54f296 (diff)
downloadscala-cc6f5f97f8a4290391a69ac96f134cb3e8ed4381.tar.gz
scala-cc6f5f97f8a4290391a69ac96f134cb3e8ed4381.tar.bz2
scala-cc6f5f97f8a4290391a69ac96f134cb3e8ed4381.zip
Merge remote-tracking branch 'paulp/topic/gitattributes' into 2.10.x
Diffstat (limited to 'test/files/neg/macro-override-macro-overrides-abstract-method-b.check')
-rw-r--r--test/files/neg/macro-override-macro-overrides-abstract-method-b.check10
1 files changed, 5 insertions, 5 deletions
diff --git a/test/files/neg/macro-override-macro-overrides-abstract-method-b.check b/test/files/neg/macro-override-macro-overrides-abstract-method-b.check
index 4d95dfc45c..895e0dca50 100644
--- a/test/files/neg/macro-override-macro-overrides-abstract-method-b.check
+++ b/test/files/neg/macro-override-macro-overrides-abstract-method-b.check
@@ -1,5 +1,5 @@
-Impls_Macros_1.scala:12: error: overriding method foo in trait Foo of type (x: Int)Int;
- macro method foo cannot override an abstract method
- def foo(x: Int) = macro Impls.impl
- ^
-one error found
+Impls_Macros_1.scala:12: error: overriding method foo in trait Foo of type (x: Int)Int;
+ macro method foo cannot override an abstract method
+ def foo(x: Int) = macro Impls.impl
+ ^
+one error found