From: Juanma Barranquero <lekktu@gmail.com>
Date: Mon, 4 Dec 2006 01:02:12 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.92~333
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=43dbe40498d873e530c821594e362d7c2c2dea99;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df8e9da2604..0200860211b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.