From 6ac495c3a791ab71a4fb0a19b2d9f88f77efb558 Mon Sep 17 00:00:00 2001
From: handa <handa>
Date: Thu, 5 Apr 2007 04:58:11 +0000
Subject: [PATCH] *** empty log message ***

---
 src/ChangeLog |    1 -
 1 file changed, 1 deletion(-)

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.
-- 
1.7.10.4