*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a1f8ce7823b5ca9aeb77c827e361983b02e631db..21bc81aa63bcf8c57e871b6d618557b311e6d329 100644 (file)
--- 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