Mercurial > emacs
diff lisp/ChangeLog @ 44489:11cfa2d8efb5
*** empty log message ***
author | Colin Walters <walters@gnu.org> |
---|---|
date | Wed, 10 Apr 2002 19:17:05 +0000 |
parents | 3d2cd2b5a07b |
children | 1e3af4fc0409 |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Apr 10 19:16:49 2002 +0000 +++ b/lisp/ChangeLog Wed Apr 10 19:17:05 2002 +0000 @@ -131,14 +131,10 @@ * files.el (display-time-string): Fix last change. -<<<<<<< ChangeLog ->>>>>>> 1.3683 -======= 2002-04-07 Sam Steingold <sds@gnu.org> * vc-cvs.el (vc-cvs-checkin): Pass the required argument to `error'. ->>>>>>> 1.3687 2002-04-07 Jason Rumney <jasonr@gnu.org> * international/mule-cmds.el (set-default-coding-systems) @@ -152,7 +148,6 @@ * simple.el (play-sound): Move to subr.el. ->>>>>>> 1.3679 2002-04-06 Richard M. Stallman <rms@gnu.org> * files.el (display-time-string-forms): Mark as risky.