fix stray file merge artifact

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

diff --git a/CHANGES b/CHANGES
index 62efcc17437dccddc6bd63fd8f26b8846ff93acc..8a179cff1eed8916456990a78b09504530b38d71 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,5 @@
                                                          -*- coding: utf-8 -*-
 
-<<<<<<< .working
 Changes with Apache 2.4.3
 
   *) SECURITY: CVE-2012-2687 (cve.mitre.org)