From eaa879d2e4edc2959a7cb5cb98df958c53a9a482 Mon Sep 17 00:00:00 2001
From: ntakahas <ntakahas>
Date: Fri, 19 Feb 2010 13:06:40 +0000
Subject: [PATCH] *** empty log message ***

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

diff --git a/ChangeLog b/ChangeLog
index c724940..ac96436 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,7 +15,6 @@
 	after-c when an initial consonant is typed.
 	(state:after-c): New state.
 
->>>>>>> 1.361
 2010-02-12  Kenichi Handa  <handa@m17n.org>
 
 	* UNIDATA/CaseFolding.txt, UNIDATA/copyright.html,
-- 
1.7.10.4