diff options
| -rw-r--r-- | lisp/ChangeLog | 1 |
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. |