fix merge conflicts
authorJan Pospíšil <honik@ntc.zcu.cz>
Tue, 16 Oct 2007 20:43:09 +0000 (20:43 +0000)
committerJan Pospíšil <honik@ntc.zcu.cz>
Tue, 16 Oct 2007 20:43:09 +0000 (20:43 +0000)
commit3b06086707aa02938b512a6b8c0c12ae9b39f1ec
tree224bf544d8be21a268996d00a47b0b6467f0bdd1
parentd38850623497d804a6bb24fe4c9a5d37aa6957ac
fix merge conflicts
org.glite.lb.common/Makefile