summaryrefslogtreecommitdiff
path: root/test/files/neg/nested-annotation.check
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-09-24 05:57:42 -0700
committerJason Zaugg <jzaugg@gmail.com>2013-09-24 05:57:42 -0700
commitc9fdcec4577932d001a865a7f6606c6e59f58cd3 (patch)
treee98628afaa1086c3cb8c99af3921f19b31fb5f1b /test/files/neg/nested-annotation.check
parentc2e3b0656bb449e95a529e266294aeabb9cbef3f (diff)
parentefd64ae594e286d2141d2cb99ec25d97de60a414 (diff)
downloadscala-c9fdcec4577932d001a865a7f6606c6e59f58cd3.tar.gz
scala-c9fdcec4577932d001a865a7f6606c6e59f58cd3.tar.bz2
scala-c9fdcec4577932d001a865a7f6606c6e59f58cd3.zip
Merge pull request #2980 from huitseeker/revert-2957
Revert #2957
Diffstat (limited to 'test/files/neg/nested-annotation.check')
-rw-r--r--test/files/neg/nested-annotation.check2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/neg/nested-annotation.check b/test/files/neg/nested-annotation.check
index c077d35a29..ca263943fe 100644
--- a/test/files/neg/nested-annotation.check
+++ b/test/files/neg/nested-annotation.check
@@ -5,6 +5,6 @@ class ComplexAnnotation(val value: Annotation) extends ClassfileAnnotation
^
nested-annotation.scala:8: error: nested classfile annotations must be defined in java; found: inline
@ComplexAnnotation(new inline) def bippy(): Int = 1
- ^
+ ^
one warning found
one error found