# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1247794370 0
# Node ID 993dd6f7d1a280bfff7864471b9c20d11f993629
# Parent  2f59f01ae070cbc1b06cee56250ffbf560f82209
Fix last change.

diff -r 2f59f01ae070 -r 993dd6f7d1a2 src/ChangeLog
--- a/src/ChangeLog	Fri Jul 17 01:28:58 2009 +0000
+++ b/src/ChangeLog	Fri Jul 17 01:32:50 2009 +0000
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2009-07-17  Kenichi Handa  <handa@m17n.org>
 
 	* casetab.c (shuffle): Fix the logic of setting up the cycle.