diff options
| author | Per Abrahamsen <abraham@dina.kvl.dk> | 2002-02-12 09:57:40 +0000 |
|---|---|---|
| committer | Per Abrahamsen <abraham@dina.kvl.dk> | 2002-02-12 09:57:40 +0000 |
| commit | 8acf46ddd41995efb5ab5d6f6aaf9fb6fe61139c (patch) | |
| tree | 5ae931561c6ebab2c8e6cdf1fbbed6f7f72ebfb7 /lisp | |
| parent | f49909700b5fd44a10e7983a89ad9a0710fdddf4 (diff) | |
| download | emacs-8acf46ddd41995efb5ab5d6f6aaf9fb6fe61139c.tar.gz | |
merge fix
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 16d6cd9207a..9f16a677bbb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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) |