Mercurial > emacs

diff src/ChangeLog @ 97911:c0bad9d229bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Kenichi Handa <handa@m17n.org>
date Mon, 01 Sep 2008 05:36:13 +0000
parents f2322a17046c
children 8fd36062fb9c
line wrap: on
line diff
--- a/src/ChangeLog	Mon Sep 01 05:34:15 2008 +0000
+++ b/src/ChangeLog	Mon Sep 01 05:36:13 2008 +0000
@@ -57,7 +57,6 @@
 
 	* w32uniscribe.c (uniscribe_check_otf): Don't fallback on DFLT script.
 
->>>>>>> 1.6936
 2008-08-29  Eli Zaretskii  <eliz@gnu.org>
 
 	* composite.c (fill_gstring_body): Avoid compiler warnings.