Commit e2fd721f authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

A bit more garbage I missed in the previous conflict 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@536018 13f79535-47bb-0310-9956-ffa450edef68
parent b68f1802

STATUS

+0 −3
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



<<<<<<< .mine

   * mod_cache: Correctly cache objects whose URL query string has been

     modified by mod_rewrite.

        PR: 40805
@@ -87,8 +86,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
       Trunk version works

     +1: rpluem, jim, wrowe



=======

>>>>>>> .r536001

   * mod_headers: Allow % at the end of a Header value

       PR: 36609

     http://svn.apache.org/viewvc?rev=490156&view=rev