From: Jan Pospíšil <honik@ntc.zcu.cz>
Date: Wed, 17 Oct 2007 07:57:45 +0000 (+0000)
Subject: fix merge conflicts
X-Git-Tag: org-gridsite-core_R_1_5_3~21
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=8457e69b529026637357b5aed0f2f3adf20ef4e0;p=jra1mw.git

fix merge conflicts
---

diff --git a/org.glite.lb.common/src/context.c b/org.glite.lb.common/src/context.c
index 52d3c32..33f7ef5 100644
--- a/org.glite.lb.common/src/context.c
+++ b/org.glite.lb.common/src/context.c
@@ -479,16 +479,11 @@ int edg_wll_GenerateSubjobIds(
 		retjobs == NULL)
 		return edg_wll_SetError(ctx, ENOMEM, NULL);
 
-/* TODO: merge */
-<<<<<<< context.c
-	if ( !seed || !strcmp(seed, "(nil)") ) {
-=======
 	if ( !seed ) {
->>>>>>> 1.23.2.10
 		intseed = strdup("edg_wll_GenerateSubjobIds()");
-	}
-	else
+	} else {
 		intseed = strdup(seed);
+	}
 
 	for (subjob = 0; subjob < num_subjobs; subjob++) {