1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 73a30f6d1..92192de37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,7 +24,6 @@
 	* unposted: Completion/Base/Widget/_complete_debug: add a colon
 	command so name and version of zsh appear in debug output.
 
->>>>>>> 1.2661
 2005-05-21  Doug Kearns  <djkea2@gus.gscit.monash.edu.au>
 
 	* unposted: Completion/Unix/Command/_webbrowser: add firefox to