Integrated: Fix merge bug

Thu Dec 17 00:46:00 UTC 2020

On Thu, 17 Dec 2020 00:37:15 GMT, Jesper Wilhelmsson <jwilhelm at openjdk.org> wrote:

> A merge in the latest change undid an older fix in the maintainer-pain anchor.

This pull request has now been integrated.

Changeset: 6e5197d9
Author:    Jesper Wilhelmsson <jwilhelm at openjdk.org>
URL:       https://git.openjdk.java.net/guide/commit/6e5197d9
Stats:     1 line in 1 file changed: 0 ins; 0 del; 1 mod

Fix merge bug

Reviewed-by: iris

-------------

PR: https://git.openjdk.java.net/guide/pull/40