Fix merge errors (duplicates).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6261d01448713d432d1e640e1fcc5f2f071d93ed..665552955d945c944870f1712e55fa5828c8cec7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-23  Glenn Morris  <rgm@gnu.org>
+
+       * textmodes/org.el (org-export-latex-cleaned-string): Fix declaration.
+
 2008-01-23  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * progmodes/sh-script.el (sh-basic-offset):
@@ -9,20 +13,6 @@
        * icomplete.el (icomplete-get-keys):
        Look up KEYS using all maps in proper buffer.
 
-2008-01-23  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
-           Miles Bader  <miles@gnu.org>
-
-       * blank-mode.el: New file.  Minor mode to visualise TAB,
-       (HARD) SPACE, NEWLINE.  Miles Bader <miles@gnu.org> wrote the original
-       code for handling display table (via visws.el package), his code was
-       modified, but the main idea was kept.
-
-2008-01-23  Alan Mackenzie  <acm@muc.de>
-
-       * progmodes/cc-vars.el (c-constant-symbol): Put this defun inside
-       an eval-and-compile, so as to permit byte-compiling (e.g. in
-       bootstrap).
-
 2008-01-23  Juanma Barranquero  <lekktu@gmail.com>
 
        * frame.el (display-mm-height, display-mm-width):