Resolve conflicts.
authorZdeněk Salvet <salvet@ics.muni.cz>
Wed, 17 Oct 2007 08:41:43 +0000 (08:41 +0000)
committerZdeněk Salvet <salvet@ics.muni.cz>
Wed, 17 Oct 2007 08:41:43 +0000 (08:41 +0000)
commit8bf0418fc500880418f8c61d175a02a452b42e81
treee60c17c30901b8e35b776ac462f7a042eee7e46e
parent8457e69b529026637357b5aed0f2f3adf20ef4e0
Resolve conflicts.
org.glite.lb.server/src/bkserverd.c
org.glite.lb.server/src/jobstat.c
org.glite.lb.server/src/jobstat.h
org.glite.lb.server/src/jobstat_supp.c