diff options
| -rw-r--r-- | lisp/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 954ff20d4e8..c0ab0b5471e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | * emacs-lisp/cl-extra.el (cl-macroexpand-all): Fix code-walk for | 27 | * emacs-lisp/cl-extra.el (cl-macroexpand-all): Fix code-walk for |
| 28 | lexical-let when encountering ((lambda (...) ...) ...). | 28 | lexical-let when encountering ((lambda (...) ...) ...). |
| 29 | 29 | ||
| 30 | >>>>>>> 1.8828 | ||
| 31 | 2005-12-17 Chong Yidong <cyd@stupidchicken.com> | 30 | 2005-12-17 Chong Yidong <cyd@stupidchicken.com> |
| 32 | 31 | ||
| 33 | * progmodes/sh-script.el (sh-mode): | 32 | * progmodes/sh-script.el (sh-mode): |