summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2005-12-07 23:30:07 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2005-12-07 23:30:07 +0000
commitde9a15ef2258765e9ada50c94d3c9f6d24b930ae (patch)
tree8e8db276aef14785940d11ea402ca50e1f0b956d
parentf766a027756aaa6cff28f3be4a8c4cb610e7dd9e (diff)
downloadzsh-de9a15ef2258765e9ada50c94d3c9f6d24b930ae.tar.gz
zsh-de9a15ef2258765e9ada50c94d3c9f6d24b930ae.tar.xz
zsh-de9a15ef2258765e9ada50c94d3c9f6d24b930ae.zip
22056: Restore MIME style defaults
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
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