CS adjustment

phpseclib · Nov 22, 2023 · eafbc8a · eafbc8a
1 parent 964d781
commit eafbc8a
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
@@ -1183,7 +1183,6 @@ public function testMultiCertPEM()
     }
 
     /**
-<<<<<<< HEAD
      * @group github1586
      */
     public function testComputeKeyIdentifier()