Skip to content
Permalink
Browse files

8255032: Conflict between recent pushes breaks the build

Reviewed-by: redestad, vromero
  • Loading branch information
jonathan-gibbons committed Oct 19, 2020
1 parent cb5cdd7 commit 0f4fb367d54ca80ba141ddbf5466a24262d3cbdc
@@ -117,7 +117,7 @@ public HtmlConfiguration getConfiguration() {
}

@Override // defined by AbstractDoclet
public void generateClassFiles(DocletEnvironment docEnv, ClassTree classTree) throws DocletException {
public void generateClassFiles(ClassTree classTree) throws DocletException {

if (!(configuration.getOptions().noDeprecated()
|| configuration.getOptions().noDeprecatedList())) {
@@ -128,7 +128,7 @@ public void generateClassFiles(DocletEnvironment docEnv, ClassTree classTree) th
}
}

super.generateClassFiles(docEnv, classTree);
super.generateClassFiles(classTree);
}

/**

1 comment on commit 0f4fb36

@bridgekeeper

This comment has been minimized.

Copy link

@bridgekeeper bridgekeeper bot commented on 0f4fb36 Oct 19, 2020

Please sign in to comment.