Merge conflict fix

Author: jackctj117

tests/api/test_asn.c

@@ -709,6 +709,10 @@ int test_SerialNumber0_RootCA(void)
           !WOLFSSL_ASN_ALLOW_0_SERIAL */
 #endif /* !NO_CERTS && !NO_FILESYSTEM && !NO_RSA && WOLFSSL_CERT_GEN && 
           WOLFSSL_CERT_EXT */
+
+    return EXPECT_RESULT();
+}
+
 int test_wolfssl_local_MatchBaseName(void)
 {
     EXPECT_DECLS;

tests/api/test_asn.h

@@ -34,7 +34,7 @@ int test_wolfssl_local_MatchBaseName(void);
     TEST_DECL_GROUP("asn", test_SetAsymKeyDer),                     \
     TEST_DECL_GROUP("asn", test_GetSetShortInt),                    \
     TEST_DECL_GROUP("asn", test_wc_IndexSequenceOf),                \
-    TEST_DECL_GROUP("asn", test_SerialNumber0_RootCA)
+    TEST_DECL_GROUP("asn", test_SerialNumber0_RootCA),              \
     TEST_DECL_GROUP("asn", test_wolfssl_local_MatchBaseName)
 
 #endif /* WOLFCRYPT_TEST_ASN_H */