Merge branch '3.0'

phpseclib · Nov 22, 2023 · cf18ffc · cf18ffc
2 parents 7294cf9 + eafbc8a
commit cf18ffc
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/tests/Unit/File/X509/X509Test.php b/tests/Unit/File/X509/X509Test.php
@@ -1185,7 +1185,6 @@ public function testMultiCertPEM(): void
     }
 
     /**
-<<<<<<< HEAD
      * @group github1586
      */
     public function testComputeKeyIdentifier(): void