changeset 38157:b40aa3cc20cf

Fix some formatting errors, and a left-over from some unsuccessful merge.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 23 Jun 2001 07:51:03 +0000
parents e46c555b62c8
children a137fb27df08
files lisp/ChangeLog
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Jun 22 21:45:48 2001 +0000
+++ b/lisp/ChangeLog	Sat Jun 23 07:51:03 2001 +0000
@@ -39,7 +39,7 @@
 	Also, added a comment describing how to greatly speedup Eshell
 	loadup time, by concatenating together all of Eshell's .elc files.
 
-2001-06-18  John Wiegley  <johnw@gnu.org>
+2001-06-19  John Wiegley  <johnw@gnu.org>
 
 	* eshell/esh-mode.el: Disabled a test that often yields false
 	failures.
@@ -209,7 +209,6 @@
 	* server.el (server-process, server-buffer-clients): Doc fix.
 	From Pavel Jan,Bm(Bk <Pavel@Janik.cz>.
 
->>>>>>> 1.2419
 2001-06-09  John Wiegley  <johnw@gnu.org>
 
 	* eshell/esh-cmd.el (eshell-exit-success-p): Use a string-match to