From: Jan Pospíšil <honik@ntc.zcu.cz>
Date: Tue, 16 Oct 2007 20:43:09 +0000 (+0000)
Subject: fix merge conflicts
X-Git-Tag: org-gridsite-core_R_1_5_3~25
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=3b06086707aa02938b512a6b8c0c12ae9b39f1ec;p=jra1mw.git

fix merge conflicts
---

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index 44b1b07..5e4aecb 100644
--- 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 $<