From 5cc6c4de66fcf25a65410dc4d70252e8a72a1bba Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Mon, 28 Sep 2015 13:12:17 +0000 Subject: [PATCH] oops git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705684 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/ssl_engine_kernel.c | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c index 4992ac0a0a..7d5e891286 100644 --- 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 /* -- 2.40.0