From fa3c441a9f14b19778e44e11ce68e130c4ac616a Mon Sep 17 00:00:00 2001
From: Eric Covener <covener@apache.org>
Date: Wed, 14 Jan 2015 22:35:02 +0000
Subject: [PATCH] remove bad merge from CHANGES in r1651656

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1651856 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3b2282233b..99f8f5350e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -44,10 +44,6 @@ Changes with Apache 2.4.11
   *) mod_proxy_fcgi: Remove proxy:balancer:// prefix from SCRIPT_FILENAME
      passed to fastcgi backends. [Eric Covener]
 
-  *) mod_ssl: Add support for extracting subjectAltName entries of type
-     rfc822Name and dNSName into SSL_{CLIENT,SERVER}_SAN_{Email,DNS}_n
-     environment variables. Also addresses PR 57207. [Kaspar Brand]
-
   *) core: Configuration files with long lines and continuation characters
      are not read properly. PR 55910. [Manuel Mausz <manuel-as mausz.at>]
 
-- 
2.40.0