From: handa <handa>
Date: Thu, 5 Apr 2007 04:58:11 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: FLT-base~88
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ac495c3a791ab71a4fb0a19b2d9f88f77efb558;p=m17n%2Fm17n-lib.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a8b6c40..4f6c074 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -124,7 +124,6 @@
 	(handle_key): When a key is unhandled, shift to the initial state
 	only if the current state has no branch action.
 
->>>>>>> 1.284
 2007-02-12  Kenichi Handa  <handa@m17n.org>
 
 	* input.c (get_preceding_char): Unref mt if necessary.