# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 978861419 0
# Node ID 77df443385ca149c9665dc6fecbe0854baead550
# Parent  00b4a3c742a235efff9b2866fdda46b9143f5e35
*** empty log message ***

diff -r 00b4a3c742a2 -r 77df443385ca lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jan 07 09:53:54 2001 +0000
+++ b/lisp/ChangeLog	Sun Jan 07 09:56:59 2001 +0000
@@ -1386,7 +1386,6 @@
 	`verbatim' so that we don't inadvertently delete a non-existant
 	directory name.
 
->>>>>>> 1.1768
 2000-11-27  Kenichi Handa  <handa@etl.go.jp>
 
 	* international/characters.el: Specify cases and syntaxes for