[glibmm/glibmm-3maybe] Fixed a mistake in the merge to fix the build.

[Murray Cumming <murrayc src gnome org>]

commit 224e9fb7db7dba4d90840c14b014ede2aa41a876
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Jul 28 12:48:00 2010 +0200

    Fixed a mistake in the merge to fix the build.

 glib/src/filelist.am |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/glib/src/filelist.am b/glib/src/filelist.am
index 72cfe7d..993027d 100644
--- a/glib/src/filelist.am
+++ b/glib/src/filelist.am
@@ -41,4 +41,3 @@ glibmm_files_ccg = $(glibmm_files_hg:.hg=.ccg)
 glibmm_files_cc_m4 = value_basictypes.cc.m4 variant_basictypes.cc.m4
 glibmm_files_h_m4  = signalproxy.h.m4 value_basictypes.h.m4 \
 	variant_basictypes.h.m4
->>>>>>> master