Integrated: Resolved merge conflict caused by CODETOOLS-7902876

Tue Apr 13 04:28:13 UTC 2021

On Tue, 13 Apr 2021 03:59:07 GMT, Leonid Kuskov <lkuskov at openjdk.org> wrote:

> This is the fix to remove the merge conflict caused by the CODETOOLS-7902876 integration

This pull request has now been integrated.

Changeset: e2440f27
Author:    Leonid Kuskov <lkuskov at openjdk.org>
URL:       https://git.openjdk.java.net/jcov/commit/e2440f27
Stats:     11 lines in 4 files changed: 0 ins; 5 del; 6 mod

Resolved merge conflict caused by CODETOOLS-7902876

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

PR: https://git.openjdk.java.net/jcov/pull/13