projects / m17n / m17n-db.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
*** empty log message ***
[m17n/m17n-db.git] / ChangeLog
diff --git a/ChangeLog b/ChangeLog
index c724940..ac96436 100644 (file)
--- 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,