aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 11189fc2d48..74468560362 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,3 @@
1<<<<<<< ChangeLog
22009-07-17 Kenichi Handa <handa@m17n.org> 12009-07-17 Kenichi Handa <handa@m17n.org>
3 2
4 * casetab.c (shuffle): Fix the logic of setting up the cycle. 3 * casetab.c (shuffle): Fix the logic of setting up the cycle.