summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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