[Emacs-diffs] emacs/src ChangeLog

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/07/17 01:32:51

Modified files:
        src            : ChangeLog 

Log message:
        Fix last change.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7653&r2=1.7654

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7653
retrieving revision 1.7654
diff -u -b -r1.7653 -r1.7654
--- ChangeLog   17 Jul 2009 01:28:58 -0000      1.7653
+++ ChangeLog   17 Jul 2009 01:32:50 -0000      1.7654
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2009-07-17  Kenichi Handa  <address@hidden>
 
        * casetab.c (shuffle): Fix the logic of setting up the cycle.