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

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/09/01 05:36:14

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.6937
retrieving revision 1.6938
diff -u -b -r1.6937 -r1.6938
--- ChangeLog   1 Sep 2008 05:34:15 -0000       1.6937
+++ ChangeLog   1 Sep 2008 05:36:13 -0000       1.6938
@@ -57,7 +57,6 @@
 
        * w32uniscribe.c (uniscribe_check_otf): Don't fallback on DFLT script.
 
->>>>>>> 1.6936
 2008-08-29  Eli Zaretskii  <address@hidden>
 
        * composite.c (fill_gstring_body): Avoid compiler warnings.