[aarch64-port-dev ] git: openjdk/aarch64-port: master: 8255032: Conflict between recent pushes breaks the build

[Jonathan Gibbons]

Changeset: 0f4fb367
Author:    Jonathan Gibbons <jjg at openjdk.org>
Date:      2020-10-19 22:05:47 +0000
URL:       https://git.openjdk.java.net/aarch64-port/commit/0f4fb367

8255032: Conflict between recent pushes breaks the build

Reviewed-by: redestad, vromero

! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java