diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am index aa0922d75a..5c7d863373 100644 --- a/src/gnome-utils/Makefile.am +++ b/src/gnome-utils/Makefile.am @@ -185,6 +185,10 @@ libgncmod_gnome_utils_la_LIBADD = \ ${GUILE_LIBS} \ ${GLIB_LIBS} \ ${DB_LIBS} \ +<<<<<<< HEAD +======= + ${QOF_LIBS} \ +>>>>>>> origin/webkit ${REGEX_LIBS} \ ${LIBXML2_LIBS}