Resolve conflicts.
authorZdeněk Salvet <salvet@ics.muni.cz>
Mon, 22 Oct 2007 09:03:14 +0000 (09:03 +0000)
committerZdeněk Salvet <salvet@ics.muni.cz>
Mon, 22 Oct 2007 09:03:14 +0000 (09:03 +0000)
commit3bd19f58a2d40846e77c00a788d006d314944bdd
tree1852ff6f9f14bb710e1ebfef94840e8aa1f8b1f3
parent17bb631d5303c1fb1e7255e02bfea5c3eaf3eb51
Resolve conflicts.
org.glite.lb.server/src/query.c
org.glite.lb.server/src/store.c.T
org.glite.lb.server/src/userjobs.c