From e08e95afdb2a86d0e575e7498942e9fa0d055f59 Mon Sep 17 00:00:00 2001
From: Bart Schaefer <barts@users.sourceforge.net>
Date: Fri, 22 Apr 2011 06:01:44 +0000
Subject: remove stray conflict marker

---
 ChangeLog | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c6cc365d9..fb81ebab7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,7 +49,6 @@
 	* 28998: Completion/Unix/Command/_make: set return status
 	correctly.
 
->>>>>>> 1.5257
 2011-04-14  Peter Stephenson  <pws@csr.com>
 
 	* 28997: configure.ac, Src/system.h: make --enable-libc-musl
@@ -14503,5 +14502,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5258 $
+* $Revision: 1.5259 $
 *****************************************************
-- 
cgit v1.2.3