*** empty log message ***

* empty log message *
43dbe404 · Juanma Barranquero · a8d5f40f · 43dbe404
Commit 43dbe404 authored Dec 04, 2006 by Juanma Barranquero
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

lisp/ChangeLog lisp/ChangeLog +0 -5

No files found.
--- 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.