# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 940427759 0
# Node ID ca021b60a2fd6d6bfff100650c5b51fd1b94af89
# Parent  3195d4a66146366000b404d9996f50c8ef426eee
*** empty log message ***

diff -r 3195d4a66146 -r ca021b60a2fd lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Oct 20 13:54:25 1999 +0000
+++ b/lisp/ChangeLog	Wed Oct 20 13:55:59 1999 +0000
@@ -96,7 +96,6 @@
 
 	* emacs-lisp/eval-reg.el: Removed -- not now needed by edebug.
 
->>>>>>> 1.58
 1999-10-19  Sam Steingold  <sds@ksp.com>
 
 	* map-ynp.el (map-y-or-n-p): Remove extraneous `not' to