Integrated: Merge jdk:master

Fri Sep 11 16:54:36 UTC 2020

On Fri, 11 Sep 2020 16:46:17 GMT, Kevin Rushforth <kcr at openjdk.org> wrote:

> Resolve trivial merge conflict in `.jcheck/conf`

This pull request has now been integrated.

Changeset: e7823d82
Author:    Kevin Rushforth <kcr at openjdk.org>
URL:       https://git.openjdk.java.net/lanai/commit/e7823d82
Stats:     0 lines in 0 files changed: 0 ins; 0 del; 0 mod

Merge jdk:master

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

PR: https://git.openjdk.java.net/lanai/pull/96