From 5f02ac6111c58a6ef435a128198da44489405d86 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Wed, 17 Oct 2007 08:47:13 +0000 Subject: [PATCH] merge cleanup --- org.glite.lb.server/src/lb_authz.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/org.glite.lb.server/src/lb_authz.c b/org.glite.lb.server/src/lb_authz.c index 61daf24..9543dfc 100644 --- a/org.glite.lb.server/src/lb_authz.c +++ b/org.glite.lb.server/src/lb_authz.c @@ -120,9 +120,6 @@ edg_wll_SetVomsGroups(edg_wll_Context ctx, edg_wll_GssConnection *gss, char *ser memset (&ctx->vomsGroups, 0, sizeof(ctx->vomsGroups)); edg_wll_ResetError(ctx); -/* TODO: merge */ -<<<<<<< lb_authz.c -======= if (ctx->fqans) { char **f; for (f = ctx->fqans; f && *f; f++) @@ -146,7 +143,6 @@ edg_wll_SetVomsGroups(edg_wll_Context ctx, edg_wll_GssConnection *gss, char *ser goto end; } ->>>>>>> 1.11.8.1 /* uses X509_CERT_DIR and X509_VOMS_DIR vars */ voms_info = VOMS_Init(voms_dir, ca_dir); if (voms_info == NULL) { -- 1.8.2.3