add security/infra/java/security/cert/CertPathValidator/certification…

…/CAInterop.java#teliasonerarootcav1 8333640 generic-all
dragonwell-project · Oct 21, 2024 · 441779b · 441779b
1 parent 6f84918
commit 441779b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
@@ -505,9 +505,5 @@ security/infra/java/security/cert/CertPathValidator/certification/CertignaCA.jav
 
 ############################################################################
 security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#certignarootca         8331883 generic-all
-<<<<<<< HEAD
-security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java                       8314509 generic-all
-=======
 security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#teliasonerarootcav1    8333640 generic-all
 security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java                       8314509 generic-all
->>>>>>> jdk8u432-ga