summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2006-03-06 20:27:28 +0000
committerChong Yidong <cyd@stupidchicken.com>2006-03-06 20:27:28 +0000
commit977c9661d3005d3d6562f94add078fcb96de523f (patch)
treedfac80523737d6bcc2c5fb93d68c9a6d009e3cdf
parentaa38f98ed35bbff5c0dde3394d9029478ba4937d (diff)
downloademacs-977c9661d3005d3d6562f94add078fcb96de523f.tar.gz
Typo.
-rw-r--r--lisp/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac8adc89ea5..788c2b83c47 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -9,7 +9,6 @@
* complete.el (PC-expand-many-files): Try be more careful when parsing
the shell's output.
->>>>>>> 1.9228
2006-03-05 Stefan Monnier <monnier@iro.umontreal.ca>
* outline.el (hide-sublevels): Provide better interactive default.