changeset 34388:6022182a4421

*** empty log message ***
author Kenichi Handa <handa@m17n.org>
date Sat, 09 Dec 2000 01:34:13 +0000
parents 30fe602d7443
children 779f5314f5fa
files lisp/ChangeLog
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Dec 08 22:25:39 2000 +0000
+++ b/lisp/ChangeLog	Sat Dec 09 01:34:13 2000 +0000
@@ -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