oops

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705684 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index 4992ac0a0ae9d1960506b6ef07fc7d693caa1d54..7d5e8912866b36d875f0fc57a54e0b12761ed038 100644 (file)
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -2135,7 +2135,6 @@ int ssl_callback_SessionTicket(SSL *ssl,
 }
 #endif /* HAVE_TLS_SESSION_TICKETS */
 
-<<<<<<< .working
 #ifdef HAVE_TLS_ALPN
 
 /*