From: ntakahas <ntakahas>
Date: Fri, 19 Feb 2010 13:06:40 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: REL-1-6-0~40
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=eaa879d2e4edc2959a7cb5cb98df958c53a9a482;p=m17n%2Fm17n-db.git

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

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,