From df73c314163a4a1017671d5b2bb4f207ad0f816b Mon Sep 17 00:00:00 2001
From: Kenichi Handa <handa@m17n.org>
Date: Sat, 9 Dec 2000 01:34:13 +0000
Subject: [PATCH] *** empty log message ***

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a1f8ce7823b..21bc81aa63b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -49,7 +49,6 @@
 
 	* textmodes/ispell.el (ispell): Doc fix.
 
->>>>>>> 1.1667
 2000-12-08  Kenichi Handa  <handa@etl.go.jp>
 
 	* international/quail.el (quail-insert-decode-map): Check the
-- 
2.39.5