Mercurial > emacs
diff src/ChangeLog @ 32354:eaa80d9a03d4
Remove CVS merge cookie left in.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 10 Oct 2000 02:32:57 +0000 |
parents | 565db62c7ee1 |
children | ff1b5b7a651c |
line wrap: on
line diff
--- a/src/ChangeLog Tue Oct 10 02:00:52 2000 +0000 +++ b/src/ChangeLog Tue Oct 10 02:32:57 2000 +0000 @@ -33,7 +33,6 @@ (syms_of_msdos): Don't intern and don't staticpro Qbackground_color and Qforeground_color. ->>>>>>> 1.946 2000-10-07 Eli Zaretskii <eliz@is.elta.co.il> * frame.c (Fframe_parameter): For non-windowed frames, if