From: William A. Rowe Jr <wrowe@apache.org>
Date: Mon, 7 May 2007 23:25:14 +0000 (+0000)
Subject: A bit more garbage I missed in the previous conflict
X-Git-Tag: 2.2.5~255
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be696dd3521ffb9db3ec09b4691b325d633879b7;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/STATUS b/STATUS
index ded8f749688..df7885d50e2 100644
--- a/STATUS
+++ b/STATUS
@@ -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