From: Kenichi Handa <handa@m17n.org>
Date: Sat, 9 Dec 2000 01:34:13 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.93~67
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=df73c314163a4a1017671d5b2bb4f207ad0f816b;p=emacs.git

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

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