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

…/CertignaCA.java generic-all
dragonwell-project · Jul 29, 2024 · c5e56a8 · c5e56a8
1 parent b50bb2a
commit c5e56a8
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
@@ -386,16 +386,12 @@ sample/chatserver/ChatTest.java					8178912 generic-all
 
 ############################################################################
 
-<<<<<<< HEAD
-# china mainland network
-
-############################################################################
-
-security/infra/java/security/cert/CertPathValidator/certification/CertignaCA.java generic-all
-=======
 # cacerts tests
 
 ############################################################################
 security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#certignarootca         8331883 generic-all
 security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java                       8314509 generic-all
->>>>>>> jdk8u422-ga
+
+
+# china mainland network
+security/infra/java/security/cert/CertPathValidator/certification/CertignaCA.java generic-all