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

[Romain Francoise]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Romain Francoise <rfrancoise>   06/08/03 18:41:58

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.9900
retrieving revision 1.9901
diff -u -b -r1.9900 -r1.9901
--- ChangeLog   3 Aug 2006 18:30:13 -0000       1.9900
+++ ChangeLog   3 Aug 2006 18:41:58 -0000       1.9901
@@ -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  <address@hidden>