Remove conflict marker and merged entries about re-generating config.in.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9b6a17af4dd8c81f0629060038d8700408e2cdf9..21d1900e99cb3df6603805cb0a32fe501a791438 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 @@ third arg it->window.
        * 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.