WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix a couple rebase merge errors

pull/1044/head
John Safranek 2017-05-26 10:46:32 -07:00
parent 43f3e304e6
commit 6223f4cd8e
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/client/client.c
View File

@ -1183,7 +1183,6 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
#endif #endif
break; break;
<<<<<<< HEAD
case 'J' : case 'J' :
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13
helloRetry = 1; helloRetry = 1;