fix merge conflicts

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index 44b1b07..5e4aecb 100644 (file)
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -221,14 +221,9 @@ install: doc
        fi
 
 clean:
-<<<<<<< Makefile
        rm -rvf *.o *.lo .libs lib* *.c *.h *.dox C/ CPP/ test_parse il_test parse.cpp events.tex status.tex
        rm -vf ${globalprefix} ${lbprefix}
        rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/
-=======
-       rm -rf *.o *.lo .libs lib* *.c test_parse il_test
-
->>>>>>> 1.57.2.3
 
 %.o: %.c
        ${COMPILE} ${CFLAGS} -c $<