Mercurial > emacs

changeset 26122:ca021b60a2fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Gerd Moellmann <gerd@gnu.org>
date Wed, 20 Oct 1999 13:55:59 +0000
parents 3195d4a66146
children a82b8b03185f
files lisp/ChangeLog
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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