X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gr-qtgui%2Fsrc%2Flib%2FMakefile.am;h=4ba637ad642e988399d62f99fff626b1ed42d283;hb=f18025c099e4f69829dc4fc1732a4a9e83b3eb1d;hp=1fd199e154eff5be88a75310558a0a59afdadf33;hpb=c1e6c53608175ffcce78a09baeba2c8aaa1a847d;p=debian%2Fgnuradio

diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am
index 1fd199e1..4ba637ad 100644
--- 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 $@