[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      06/12/04 01:02:12

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.10393
retrieving revision 1.10394
diff -u -b -r1.10393 -r1.10394
--- ChangeLog   4 Dec 2006 00:33:19 -0000       1.10393
+++ ChangeLog   4 Dec 2006 01:02:12 -0000       1.10394
@@ -95,12 +95,7 @@
 
        * descr-text.el (describe-char-unicodedata-file): Fix typo in docstring.
 
-<<<<<<< ChangeLog
->>>>>>> 1.10388
-2006-12-01  Vinicius Jose Latorre  <address@hidden>
-=======
 2006-12-01  Ben North  <address@hidden>
->>>>>>> 1.10392
 
        * paren.el: Fix the highlight overlay extension when the user types a
        sequence of char very fast just before the open parenthesis.