# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1201927660 0
# Node ID afc545f3960e080eff68386b2d8ffd6d333293d8
# Parent  2122a7a1fdaaf0d6ceaa4ebfd529a7b64d849b4b
Remove conflict marker and merged entries about re-generating config.in.

diff -r 2122a7a1fdaa -r afc545f3960e src/ChangeLog
--- a/src/ChangeLog	Sat Feb 02 04:35:05 2008 +0000
+++ b/src/ChangeLog	Sat Feb 02 04:47:40 2008 +0000
@@ -354,7 +354,6 @@
 	* ftfont.c (ftfont_open): Set members maybe_otf and otf of
 	ftfont_info only when HAVE_LIBOTF is defined.
 
->>>>>>> 1.1.2.202
 2008-02-01  Andreas Schwab  <schwab@suse.de>
 
 	* xdisp.c (back_to_previous_visible_line_start): Fix type of beg
@@ -366,8 +365,6 @@
 
 2008-02-01  Kenichi Handa  <handa@ni.aist.go.jp>
 
-	* config.in: Re-generated.
-
 	* Makefile.in (ALL_CFLAGS): Add @M17N_FLT_CFLAGS@.
 	(FONTSRC, FONTOBJ) [HAVE_WINDOW_SYSTEM]: Set them unconditionally.
 	(LIBES): Add @M17N_FLT_CFLAGS@.
@@ -1922,8 +1919,6 @@
 	* composite.h (enum composition_method) [USE_FONT_BACKEND]: New
 	enumeration COMPOSITION_WITH_GLYPH_STRING.
 
-	* config.in: Re-generated.
-
 	* dispextern.h (struct glyph_string) [USE_FONT_BACKEND]: New
 	members clip_x, clip_y, clip_width, and clip_height.
 	(struct face) [USE_FONT_BACKEND]: New members font_info and extra.