martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Janik's name.
This commit is contained in:
Reiner Steib
2006-09-15 09:03:48 +00:00
parent 91a2acb229
commit efce5ce201
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lispref/ChangeLog
View File

@@ -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.