git: openjdk/jdk-sandbox: json: Fixed merge errors

duke duke at openjdk.org
Tue Jan 7 22:27:23 UTC 2025


Changeset: 4174ea97
Branch: json
Author:    Naoto Sato <naoto.sato at oracle.com>
Date:      2025-01-07 14:25:00 +0000
URL:       https://git.openjdk.org/jdk-sandbox/commit/4174ea97dc3e7ef8d3b84e398fa9e8b0490029cf

Fixed merge errors

! test/jdk/sun/security/provider/acvp/Launcher.java
! test/jdk/sun/security/provider/acvp/ML_DSA_Test.java
! test/jdk/sun/security/provider/acvp/ML_KEM_Test.java



More information about the jdk-sandbox-changes mailing list