From d101cd7411152358e57a392aff871bee6fff3dd4 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <bor@users.sourceforge.net>
Date: Fri, 1 Jun 2001 08:05:26 +0000
Subject: Oops! Extra line.

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'ChangeLog')

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
-- 
cgit 1.4.1