summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2011-04-22 06:01:44 +0000
committerBart Schaefer <barts@users.sourceforge.net>2011-04-22 06:01:44 +0000
commite08e95afdb2a86d0e575e7498942e9fa0d055f59 (patch)
tree77894274ec93b3b8bea41bd3b2e0ac002def10ad /ChangeLog
parente349201f9a9521cd4e7db2bd3f6d5016ec33001b (diff)
downloadzsh-e08e95afdb2a86d0e575e7498942e9fa0d055f59.tar.gz
zsh-e08e95afdb2a86d0e575e7498942e9fa0d055f59.tar.xz
zsh-e08e95afdb2a86d0e575e7498942e9fa0d055f59.zip
remove stray conflict marker
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog3
1 files changed, 1 insertions, 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 $
 *****************************************************