From: Glenn Morris <rgm@gnu.org>
Date: Wed, 9 May 2012 03:23:20 +0000 (-0700)
Subject: ChangeLog merge fix
X-Git-Tag: emacs-24.2.90~471^2~145
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=482276b8ceb2e3211c3c81310e387ce446fc976f;p=emacs.git

ChangeLog merge fix
---

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index e556fa7e998..1191b0de919 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,12 +1,3 @@
-2012-05-09  Glenn Morris  <rgm@gnu.org>
-
-	* emacs-lisp-intro.texi (Making Errors): Don't mention Emacs 20.
-	(Void Function, Wrong Type of Argument, Recursion with list)
-	(Simple Extension): Assume a non-ancient Emacs.
-	(Void Variable, Switching Buffers): Improve page breaks.
-
-	* emacs-lisp-intro.texi: Update GNU Press contact details.
-
 2012-05-05  Glenn Morris  <rgm@gnu.org>
 
 	* emacs-lisp-intro.texi (Making Errors): Don't mention Emacs 20.