diff options
| author | Reiner Steib <Reiner.Steib@gmx.de> | 2006-09-15 09:03:48 +0000 |
|---|---|---|
| committer | Reiner Steib <Reiner.Steib@gmx.de> | 2006-09-15 09:03:48 +0000 |
| commit | efce5ce20161481055bca6fe3fab25d6a54d0a3e (patch) | |
| tree | ecc5b5ee6405fcb4324c779e1061055a7dec4cfd | |
| parent | 91a2acb229ac102ef15866174fb2d62c8e36598c (diff) | |
| download | emacs-efce5ce20161481055bca6fe3fab25d6a54d0a3e.tar.gz emacs-efce5ce20161481055bca6fe3fab25d6a54d0a3e.tar.bz2 emacs-efce5ce20161481055bca6fe3fab25d6a54d0a3e.zip | |
Fix previous commit: Remove conflict marker. Undo unification of Pavel
Janik's name.
| -rw-r--r-- | lispref/ChangeLog | 3 |
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. |