Resolved conflicts

This commit is contained in:
Koichi Tsujino
2017-09-26 09:01:23 +09:00
parent e8f95b9252
commit b172585fc3

View File

@@ -10995,7 +10995,6 @@ void ApiTest(void)
#ifdef OPENSSL_EXTRA
/*wolfSSS_EVP_get_cipherbynid test*/
test_wolfSSL_EVP_get_cipherbynid();
#endif
#ifdef HAVE_HASHDRBG