# HG changeset patch
# User Reiner Steib <Reiner.Steib@gmx.de>
# Date 1158311028 0
# Node ID 24025d20791a5d4229d7dbab289d9f2e081865dc
# Parent  5ba1cd1da82252a5758731e2678ccba443daeefe
Fix previous commit: Remove conflict marker.  Undo unification of Pavel
Janik's name.

diff -r 5ba1cd1da822 -r 24025d20791a lispref/ChangeLog
--- a/lispref/ChangeLog	Fri Sep 15 08:53:18 2006 +0000
+++ b/lispref/ChangeLog	Fri Sep 15 09:03:48 2006 +0000
@@ -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  <rms@gnu.org>
 
 	* display.texi (Display Table Format): Wording clarification.
@@ -4881,7 +4880,7 @@
 	(info): Add target.
 	(installall): Target removed.
 
-2001-10-31  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
+2001-10-31  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
 	* tips.texi (Coding Conventions): Fix typo.