changeset 95264:9a5c3aa85e90

*** empty log message ***
author Kenichi Handa <handa@m17n.org>
date Fri, 23 May 2008 12:54:18 +0000
parents e0eb4e6f3741
children de1c8bf64340
files lisp/ChangeLog
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri May 23 12:53:22 2008 +0000
+++ b/lisp/ChangeLog	Fri May 23 12:54:18 2008 +0000
@@ -22,7 +22,6 @@
 	Exclude more '*loaddefs' files.
 	(compile-always): Simplify '.elc' deletion.
 
->>>>>>> 1.13801
 2008-05-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* vc-bzr.el (vc-bzr-annotate-time): Reduce memory allocation.