fix a couple rebase merge errors

2017-05-26 10:46:32 -07:00
parent 43f3e304e6
commit 6223f4cd8e
1 changed files with 0 additions and 1 deletions
--- a/examples/client/client.c
+++ b/examples/client/client.c
@ -1183,7 +1183,6 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
                #endif
                break;

-<<<<<<< HEAD
            case 'J' :
                #ifdef WOLFSSL_TLS13
                    helloRetry = 1;