Mercurial > emacs
changeset 69311:86ebde8d0adc
Typo.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Mon, 06 Mar 2006 20:27:28 +0000 |
| parents | 270a2959d019 |
| children | c3bd744c874c |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 0 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Mar 06 20:27:06 2006 +0000 +++ b/lisp/ChangeLog Mon Mar 06 20:27:28 2006 +0000 @@ -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.