Skip to content

GitLab

Commit efce5ce2 authored by Reiner Steib's avatar Reiner Steib
Browse files

Fix previous commit: Remove conflict marker. Undo unification of Pavel 

Janik's name.
parent 91a2acb2
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
lispref/ChangeLog
View file @ efce5ce2
......@@ -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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment