From efce5ce20161481055bca6fe3fab25d6a54d0a3e Mon Sep 17 00:00:00 2001
From: Reiner Steib <Reiner.Steib@gmx.de>
Date: Fri, 15 Sep 2006 09:03:48 +0000
Subject: [PATCH] Fix previous commit: Remove conflict marker.  Undo
 unification of Pavel Janik's name.

---
 lispref/ChangeLog | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 7b32595083..0b7903a815 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -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.
 
-- 
2.20.1