[glom] Fixed merge conflict.

[Murray Cumming <murrayc src gnome org>]

commit fd18da7fd659318985b83573b6c052fca149d9e8
Author: Murray Cumming <murrayc murrayc com>
Date:   Sat May 1 11:53:46 2010 +0200

    Fixed merge conflict.

 Makefile_tests.am |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/Makefile_tests.am b/Makefile_tests.am
index d042fe1..1c474e3 100644
--- a/Makefile_tests.am
+++ b/Makefile_tests.am
@@ -34,12 +34,8 @@ check_PROGRAMS =						\
 	tests/import/test_signals \
 	tests/test_glade_derived_instantiation \
 	tests/glade_toplevels_instantiation \
-<<<<<<< HEAD:Makefile_tests.am
-	tests/test_selfhosting_new_empty/test_selfhosting_new_empty \
-	tests/test_selfhosting_new_from_example/test_selfhosting_new_from_example
-=======
-	tests/test_selfhosting_new_empty
->>>>>>> glom-1-14:Makefile_tests.am
+	tests/test_selfhosting_new_empty \
+	tests/test_selfhosting_new_from_example
 
 TESTS =	tests/test_document_load	\
   tests/test_document_autosave	\