Fix some formatting errors, and a left-over from some unsuccessful merge.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8cb663ba4cede6581c06472f6f89f9cbc4016817..d1b36b4003e1a8b590488f76295e9cd375addd37 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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\e,Bm\e(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