From: Romain Francoise <romain@orebokech.com>
Date: Thu, 3 Aug 2006 18:41:58 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~1120
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8a38d42d83bb9fc54ce958ca6b791f7748e2f6d3;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1f6e469dd62..d00d8308c91 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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>