From: William A. Rowe Jr <wrowe@apache.org>
Date: Wed, 26 Jun 2013 21:47:49 +0000 (+0000)
Subject: Clean up cruft
X-Git-Tag: 2.2.25~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9916630d8f3c3b1d8c479a1a04e5ead2a7b156f;p=thirdparty%2Fapache%2Fhttpd.git

Clean up cruft

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

diff --git a/CHANGES b/CHANGES
index 201a46121d5..88184dfa98d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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