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 201a46121d5255c01e122ba9e541c207a78cf95a..88184dfa98d6d8bf835702413413009a4ba653fd 100644 (file)
--- 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