Finally, the simple fix for the qtgui issues; also, changed the naming scheme output...

diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am
index 1fd199e154eff5be88a75310558a0a59afdadf33..4ba637ad642e988399d62f99fff626b1ed42d283 100644 (file)
--- a/gr-qtgui/src/lib/Makefile.am
+++ b/gr-qtgui/src/lib/Makefile.am
@@ -73,8 +73,6 @@ grinclude_HEADERS =                   \
        qtgui_sink_c.h                  \
        qtgui_sink_f.h
 
-<<<<<<< HEAD
-
 QT_MOC_FLAGS=-DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB
 %.moc.cc : %.h
        $(QT_MOC_EXEC) $(QT_MOC_FLAGS) -p $(srcdir) $< -o $@