[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v

[Romain Francoise]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Romain Francoise <rfrancoise>   07/03/01 13:58:24

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.10751
retrieving revision 1.10752
diff -u -b -r1.10751 -r1.10752
--- ChangeLog   1 Mar 2007 13:43:48 -0000       1.10751
+++ ChangeLog   1 Mar 2007 13:58:24 -0000       1.10752
@@ -45,7 +45,6 @@
 
        * desktop.el: Delete header line listing me as maintainer.
 
->>>>>>> 1.10749
 2007-02-28  Glenn Morris  <address@hidden>
 
        * tutorial.el (tutorial--describe-nonstandard-key): Tweak text in