1 files changed, 5 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ba05615a0c3..11189fc2d48 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+<<<<<<< ChangeLog
+2009-07-17  Kenichi Handa  <handa@m17n.org>
+
+        * casetab.c (shuffle): Fix the logic of setting up the cycle.
+
 2009-07-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * nsfns.m (Fns_set_alpha): Remove function.