# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1217694464 0
# Node ID 84d4fb2fbce8391efeda8ad04ae9549a0c062c42
# Parent  390c190a3d44711fc3f818745689ee19e46d036a
*** empty log message ***

diff -r 390c190a3d44 -r 84d4fb2fbce8 src/ChangeLog
--- a/src/ChangeLog	Sat Aug 02 16:27:01 2008 +0000
+++ b/src/ChangeLog	Sat Aug 02 16:27:44 2008 +0000
@@ -2338,7 +2338,6 @@
 	(local_heap, local_alloc, local_free, malloc_widget_value)
 	(free_widget_value): Define here.
 
->>>>>>> 1.6832
 2008-06-09  Kenichi Handa  <handa@m17n.org>
 
 	* font.h (Qascii_0): Extern it.