# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1201067233 0
# Node ID 5fb00dd7ea179debaa893fc1f5cd31ace45d6ad0
# Parent  8d26c1b4608ef5d46e6a47295bbf662bd79d4878
Fix merge errors (duplicates).

diff -r 8d26c1b4608e -r 5fb00dd7ea17 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Jan 23 05:46:13 2008 +0000
+++ b/lisp/ChangeLog	Wed Jan 23 05:47:13 2008 +0000
@@ -9,20 +9,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):