From: František Dvořák Date: Wed, 17 Oct 2007 08:59:51 +0000 (+0000) Subject: merge cleanup X-Git-Tag: org-gridsite-core_R_1_5_3~18 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=69936ac9fdc446e8005b81248a277b4e82a121c1;p=jra1mw.git merge cleanup --- diff --git a/org.glite.lb.common/interface/context-int.h b/org.glite.lb.common/interface/context-int.h index 46f92f0..b10eb45 100644 --- a/org.glite.lb.common/interface/context-int.h +++ b/org.glite.lb.common/interface/context-int.h @@ -15,15 +15,8 @@ extern "C" { #endif -/* TODO: merge */ -<<<<<<< context-int.h -#define EDG_WLL_SEQ_NULL "UI=000000:NS=0000000000:WM=000000:BH=0000000000:JSS=000000:LM=000000:LRMS=000000:APP=000000:LBS=000000" -#define EDG_WLL_SEQ_PBS_NULL "TIMESTAMP=00000000000000:POS=0000000000:EV.CODE=000:SRC=?" -======= - #define EDG_WLL_SEQ_NULL "UI=000000:NS=0000000000:WM=000000:BH=0000000000:JSS=000000:LM=000000:LRMS=000000:APP=000000:LBS=000000" #define EDG_WLL_SEQ_PBS_NULL "TIMESTAMP=00000000000000:POS=0000000000:EV.CODE=000:SRC=?" ->>>>>>> 1.26.2.4 #define EDG_WLL_SEQ_CONDOR_NULL EDG_WLL_SEQ_PBS_NULL #define EDG_WLL_SEQ_SIZE (sizeof(EDG_WLL_SEQ_NULL)) #define EDG_WLL_SEQ_PBS_SIZE (sizeof(EDG_WLL_SEQ_PBS_NULL))