# HG changeset patch
# User Romain Francoise <romain@orebokech.com>
# Date 1154630518 0
# Node ID 7fcd41d936c52d4365190db25207073fa7cb1fde
# Parent  80f088e3c26d6fa8d5f25f21a9dcaa1c0bedd4b4
*** empty log message ***

diff -r 80f088e3c26d -r 7fcd41d936c5 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Aug 03 18:30:37 2006 +0000
+++ b/lisp/ChangeLog	Thu Aug 03 18:41:58 2006 +0000
@@ -185,13 +185,8 @@
 
 	* tumme.el (tumme-backward-image): Add prefix argument.  Add error
 	when at first image.
-<<<<<<< ChangeLog
-	(tumme-forward-image): Add prefix argument.
-	Add error when at last image.
-=======
 	(tumme-forward-image): Add prefix argument.  Add error when at last
 	image.
->>>>>>> 1.9899
 
 2006-07-25  Stefan Monnier  <monnier@iro.umontreal.ca>