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

[Reiner Steib]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Reiner Steib <rsteib>   06/09/15 09:03:48

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lispref/ChangeLog,v
retrieving revision 1.752
retrieving revision 1.753
diff -u -b -r1.752 -r1.753
--- ChangeLog   15 Sep 2006 07:19:15 -0000      1.752
+++ ChangeLog   15 Sep 2006 09:03:48 -0000      1.753
@@ -19,7 +19,6 @@
        (Basic Char Syntax, General Escape Syntax)
        (Ctl-Char Syntax, Meta-Char Syntax): New subnodes.
 
->>>>>>> 1.751
 2006-09-11  Richard Stallman  <address@hidden>
 
        * display.texi (Display Table Format): Wording clarification.
@@ -4881,7 +4880,7 @@
        (info): Add target.
        (installall): Target removed.
 
-2001-10-31  Pavel Jan,Am(Bk  <address@hidden>
+2001-10-31  Pavel Jan,Bm(Bk  <address@hidden>
 
        * tips.texi (Coding Conventions): Fix typo.