# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1165194132 0
# Node ID 48a1a163455aaba0d2ee69667823ec6704354b7f
# Parent  d8c2dc308e9c0b262b25cc586ddd44fe573178d9
*** empty log message ***

diff -r d8c2dc308e9c -r 48a1a163455a lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Dec 04 00:33:19 2006 +0000
+++ b/lisp/ChangeLog	Mon Dec 04 01:02:12 2006 +0000
@@ -95,12 +95,7 @@
 
 	* descr-text.el (describe-char-unicodedata-file): Fix typo in docstring.
 
-<<<<<<< ChangeLog
->>>>>>> 1.10388
-2006-12-01  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
-=======
 2006-12-01  Ben North  <ben@redfrontdoor.org>
->>>>>>> 1.10392
 
 	* paren.el: Fix the highlight overlay extension when the user types a
 	sequence of char very fast just before the open parenthesis.