From 375a330dbb82f04f6ea3be8f8b7a056ce2d6c1fc Mon Sep 17 00:00:00 2001
From: Eric Covener <covener@apache.org>
Date: Sat, 27 May 2017 20:18:02 +0000
Subject: [PATCH] bad conflict edit in r1796447

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

diff --git a/CHANGES b/CHANGES
index 4e2983f00cd..525ee178ae8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,10 +5,6 @@ Changes with Apache 2.4.26
   *) core: ap_parse_form_data() URL-decoding doesn't work on EBCDIC
      platforms. PR61124. [Hank Ibell <hwibell gmail.com>]
 
-  *) core: Deprecate ap_get_basic_auth_pw() and add 
-     ap_get_basic_auth_components(). 
-     [Emmanuel Dreyfus <manu netbsd.org>, Jacob Champion, Eric Covener]
-
   *) Evaluate nested If/ElseIf/Else configuration blocks.
      [Luca Toscano, Jacob Champion]
 
-- 
2.47.2