From de9a15ef2258765e9ada50c94d3c9f6d24b930ae Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Wed, 7 Dec 2005 23:30:07 +0000
Subject: 22056: Restore MIME style defaults

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

diff --git a/ChangeLog b/ChangeLog
index 81e37b1d4..5a59220da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,7 +38,6 @@
 	is not changed; add most-specific zstyle necessary to identify the
 	all-expansions group within _expand_word_and_keep.
 
->>>>>>> 1.2956
 2005-12-03  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 22049: Src/init.c: "exit" within sourced file within shell
-- 
cgit 1.4.1