summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lispref/ChangeLog3
1 files changed, 1 insertions, 2 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 7b32595083f..0b7903a8159 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.