summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan@lightbend.com>2016-07-18 14:41:55 -0700
committerGitHub <noreply@github.com>2016-07-18 14:41:55 -0700
commitd26b384375380e9e8ab0ef48ad66f4539dd1ef07 (patch)
tree9a33653fc18a04103eddd1ded0f805ca54e2176b /test/files
parentca57d028cebb8314aab63e3877751460231948f2 (diff)
parent543d719dce062e6ea99c21c7320def711af1cf9e (diff)
downloadscala-d26b384375380e9e8ab0ef48ad66f4539dd1ef07.tar.gz
scala-d26b384375380e9e8ab0ef48ad66f4539dd1ef07.tar.bz2
scala-d26b384375380e9e8ab0ef48ad66f4539dd1ef07.zip
Merge pull request #5246 from jodersky/javadoc
SI-4826 Retain javadoc comments in scaladoc [ci: last-only]
Diffstat (limited to 'test/files')
-rw-r--r--test/files/run/t5699.check4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/run/t5699.check b/test/files/run/t5699.check
index df19644ae6..8d19ecd321 100644
--- a/test/files/run/t5699.check
+++ b/test/files/run/t5699.check
@@ -1,10 +1,10 @@
[[syntax trees at end of parser]] // annodef.java
package <empty> {
object MyAnnotation extends {
- def <init>() = _
+ def <init>()
};
class MyAnnotation extends scala.annotation.Annotation with _root_.java.lang.annotation.Annotation with scala.annotation.ClassfileAnnotation {
- def <init>() = _;
+ def <init>();
def value(): String
}
}