From: Jeff Trawick <trawick@apache.org>
Date: Wed, 15 Aug 2012 15:03:20 +0000 (+0000)
Subject: fix stray file merge artifact
X-Git-Tag: 2.4.3~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01f08c7f6a58b35937945b2c0d84b80f013c4a6b;p=apache

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 62efcc1743..8a179cff1e 100644
--- 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)