about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrey Borzenkov <bor@users.sourceforge.net>2001-06-01 08:05:26 +0000
committerAndrey Borzenkov <bor@users.sourceforge.net>2001-06-01 08:05:26 +0000
commitd101cd7411152358e57a392aff871bee6fff3dd4 (patch)
tree30ca0474d4fb5b7732cd36521e1d48ea056b51d4
parentd344b69b0314a8e81fda0ef7731b60bb5554f7bf (diff)
downloadzsh-d101cd7411152358e57a392aff871bee6fff3dd4.tar.gz
zsh-d101cd7411152358e57a392aff871bee6fff3dd4.tar.xz
zsh-d101cd7411152358e57a392aff871bee6fff3dd4.zip
Oops! Extra line.
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d7436f592..9a13576d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,7 +27,6 @@
 
 2001-05-31  Sven Wischnowsky  <wischnow@zsh.org>
 
->>>>>>> 1.1182
 	* 14605: Src/params.c, Src/Modules/parameter.c,
 	Src/Zle/complete.c, Src/Zle/computil.c, Src/Zle/zleparameter.c:
 	fix two memory leaks (at least I hope they are fixed) and some