*** empty log message ***

diff --git a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.1/configure.mk b/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.1/configure.mk
index 860e1b46b4ae85bb3a294693ec5899b96802913e..8982371eec9c494a9a550f996da92abbfee40fc1 100644 (file)
--- a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.1/configure.mk
+++ b/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.1/configure.mk
@@ -47,18 +47,12 @@ config.make:
        @echo GTKLIBS=`$(GTKGETLIBS)` | \
          sed -e 's/-l/-cclib &/g' -e 's/-[LRWr][^ ]*/-ccopt &/g' \
          >> config.make
-<<<<<<< configure.mk
 # Luca: GtkMathView configuration
        @echo GTKMATHVIEWCFLAGS=`gtkmathview-config --cflags` >> config.make
        @echo MINIDOMCFLAGS=`minidom-config --cflags` >> config.make
        @echo GTKMATHVIEWLIBS=`gtkmathview-config --libs` >> config.make
        @echo MINIDOMLIBS=`minidom-config --libs` >> config.make
 # Luca: end of GtkMathView configuration
-=======
-       #<CSC>
-       echo GTKMATHVIEWLIBS="-ccopt \""`gtkmathview-config --libs`"\"" >> config.make
-       #</CSC>
->>>>>>> 1.2
        @echo GNOMELIBS=$(GNOMELIBS) | \
          sed -e 's/-l/-cclib &/g' -e 's/-[LRWr][^ ]*/-ccopt &/g' \
          >> config.make