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

diff --git a/CHANGES b/CHANGES
index 4e2983f00cd88ed086264fbe0cbe90bfd2a2d0bd..525ee178ae8e0a4c265fb93bed5db487cc3ad471 100644 (file)
--- 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]