Mercurial > emacs
changeset 31933:ebf9d20c93c0
*** empty log message ***
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Wed, 27 Sep 2000 11:46:33 +0000 |
| parents | 081edde76197 |
| children | 27f239b438d2 |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 0 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Sep 27 11:43:51 2000 +0000 +++ b/lisp/ChangeLog Wed Sep 27 11:46:33 2000 +0000 @@ -69,7 +69,6 @@ * startup.el (command-line-1, fancy-splash-text): Change the text to sound more friendly. ->>>>>>> 1.1138 2000-09-23 Thien-Thi Nguyen <ttn@gnu.org> * progmodes/hideshow.el: Update author email address.