Mercurial > emacs
changeset 43253:a0316e8e7bf0
merge fix
| author | Per Abrahamsen <abraham@dina.kvl.dk> |
|---|---|
| date | Tue, 12 Feb 2002 09:57:40 +0000 |
| parents | bccb026d40e4 |
| children | eb6104aac6b0 |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 0 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Feb 12 09:49:46 2002 +0000 +++ b/lisp/ChangeLog Tue Feb 12 09:57:40 2002 +0000 @@ -261,7 +261,6 @@ * cus-start.el (x-use-underline-position-properties): Allow customization. ->>>>>>> 1.3434 2002-02-04 Simon Josefsson <jas@extundo.com> * dired.el (dired-load-hook, dired-mode-hook)