*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f9c957236104b1ed4b91ed13e6ff6f302b827a50..ff0c3894c5ef5e6cbcfdd1426ca76b2da4e90407 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-01  Kenichi Handa  <handa@m17n.org>
+
+       * international/characters.el: Enable the correct case setting for
+       dotless-i and dotted-I.
+
 2005-04-01  Kim F. Storm  <storm@cua.dk>
 
        * ido.el (ido-file-internal): Fall back to non-ido command if

diff --git a/src/ChangeLog b/src/ChangeLog
index 517a0a2b479c7a4b7a529e064cc14552b0474ecd..9518de3af8f9544ffb10f4636fa5722cc08981c2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2005-04-01  Kenichi Handa  <handa@m17n.org>
 
        * lisp.h (Vascii_upcase_table, Vascii_canon_table,