From: Jim Jagielski <jim@apache.org>
Date: Mon, 28 Sep 2015 13:12:17 +0000 (+0000)
Subject: oops
X-Git-Tag: 2.4.17~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cc6c4de66fcf25a65410dc4d70252e8a72a1bba;p=thirdparty%2Fapache%2Fhttpd.git

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 4992ac0a0ae..7d5e8912866 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
 
 /*