From b172585fc380f35e851e4bafa18eb8a993278335 Mon Sep 17 00:00:00 2001
From: Koichi Tsujino <koichi_tsujino@kenlex.com>
Date: Tue, 26 Sep 2017 09:01:23 +0900
Subject: [PATCH] Resolved conflicts

---
 tests/api.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/api.c b/tests/api.c
index bd8e03ffe..f21098d6b 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -10995,7 +10995,6 @@ void ApiTest(void)
 #ifdef OPENSSL_EXTRA
     /*wolfSSS_EVP_get_cipherbynid test*/
     test_wolfSSL_EVP_get_cipherbynid();
-
 #endif
 
 #ifdef HAVE_HASHDRBG