Mercurial > emacs
changeset 72891:24025d20791a
Fix previous commit: Remove conflict marker. Undo unification of Pavel
Janik's name.
| author | Reiner Steib <Reiner.Steib@gmx.de> |
|---|---|
| date | Fri, 15 Sep 2006 09:03:48 +0000 |
| parents | 5ba1cd1da822 |
| children | 41ca3e86bd27 |
| files | lispref/ChangeLog |
| diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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.