httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r1497122 - /httpd/httpd/branches/2.2.x/CHANGES
Date Wed, 26 Jun 2013 21:47:50 GMT
Author: wrowe
Date: Wed Jun 26 21:47:49 2013
New Revision: 1497122

URL: http://svn.apache.org/r1497122
Log:
Clean up cruft

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

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1497122&r1=1497121&r2=1497122&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Wed Jun 26 21:47:49 2013
@@ -1,7 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.25
 
-<<<<<<< .working
   *) SECURITY: CVE-2013-1862 (cve.mitre.org)
      mod_rewrite: Ensure that client data written to the RewriteLog is
      escaped to prevent terminal escape sequences from entering the



Mime
View raw message