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

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/05/23 12:54:20

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.13802
retrieving revision 1.13803
diff -u -b -r1.13802 -r1.13803
--- ChangeLog   23 May 2008 12:53:22 -0000      1.13802
+++ ChangeLog   23 May 2008 12:54:18 -0000      1.13803
@@ -22,7 +22,6 @@
        Exclude more '*loaddefs' files.
        (compile-always): Simplify '.elc' deletion.
 
->>>>>>> 1.13801
 2008-05-23  Stefan Monnier  <address@hidden>
 
        * vc-bzr.el (vc-bzr-annotate-time): Reduce memory allocation.