You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by wr...@apache.org on 2007/05/08 01:25:15 UTC

svn commit: r536018 - /httpd/httpd/branches/2.2.x/STATUS

Author: wrowe
Date: Mon May  7 16:25:14 2007
New Revision: 536018

URL: http://svn.apache.org/viewvc?view=rev&rev=536018
Log:
A bit more garbage I missed in the previous conflict

Modified:
    httpd/httpd/branches/2.2.x/STATUS

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?view=diff&rev=536018&r1=536017&r2=536018
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon May  7 16:25:14 2007
@@ -77,7 +77,6 @@
 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 @@
        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