From 9cf97f2680013b54e00d1f7f9b4ea187a85c8357 Mon Sep 17 00:00:00 2001
From: Kenichi Handa <handa@m17n.org>
Date: Fri, 1 Apr 2005 01:30:38 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 5 +++++
 src/ChangeLog  | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f9c95723610..ff0c3894c5e 100644
--- 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 517a0a2b479..9518de3af8f 100644
--- 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,
-- 
2.39.2