# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1211547258 0
# Node ID 9a5c3aa85e9043e8fe2dc2d2fe22346ab47fe7af
# Parent  e0eb4e6f3741521e05c6aa08f7fb39341c32a1d8
*** empty log message ***

diff -r e0eb4e6f3741 -r 9a5c3aa85e90 lisp/ChangeLog
--- 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.