From 74e981093de7b15c0ccd66a3e53fe758ac18af64 Mon Sep 17 00:00:00 2001
From: toddouska <todd@wolfssl.com>
Date: Thu, 15 Oct 2015 09:48:07 -0700
Subject: [PATCH] fix merge conflict misses on alpn example letter change

---
 examples/client/client.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/client/client.c b/examples/client/client.c
index b105d7822..9c3b3f268 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -461,7 +461,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
     StackTrap();
 
     while ((ch = mygetopt(argc, argv,
-                          "?gdeDusmNrwRitfxXUPCh:p:v:l:A:c:k:Z:b:zS:L:ToO:an:B:"))
+                          "?gdeDusmNrwRitfxXUPCh:p:v:l:A:c:k:Z:b:zS:L:ToO:aB:"))
                                                                         != -1) {
         switch (ch) {
             case '?' :
@@ -668,7 +668,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
                 #endif
                 break;
 
-            case 'n' :
+            case 'L' :
                 #ifdef HAVE_ALPN
                     alpnList = myoptarg;