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

Posted to cvs@httpd.apache.org by tr...@apache.org on 2012/08/15 17:03:20 UTC

svn commit: r1373443 - /httpd/httpd/branches/2.4.x/CHANGES

Author: trawick
Date: Wed Aug 15 15:03:20 2012
New Revision: 1373443

URL: http://svn.apache.org/viewvc?rev=1373443&view=rev
Log:
fix stray file merge artifact

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

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1373443&r1=1373442&r2=1373443&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Wed Aug 15 15:03:20 2012
@@ -1,6 +1,5 @@
                                                          -*- coding: utf-8 -*-
 
-<<<<<<< .working
 Changes with Apache 2.4.3
 
   *) SECURITY: CVE-2012-2687 (cve.mitre.org)