[Emacs-diffs] Changes to emacs/src/ChangeLog,v

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    08/08/02 16:27:45

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.6833
retrieving revision 1.6834
diff -u -b -r1.6833 -r1.6834
--- ChangeLog   2 Aug 2008 16:27:01 -0000       1.6833
+++ ChangeLog   2 Aug 2008 16:27:44 -0000       1.6834
@@ -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  <address@hidden>
 
        * font.h (Qascii_0): Extern it.