OpenAFS CVS Commit: openafs/src/WINNT/client_exp by jaltman

[cvs@GRAND.CENTRAL.ORG]

Update of /cvs/openafs/src/WINNT/client_exp
In directory GRAND.CENTRAL.ORG:/home/jaltman/openafs/cvs-tree/src/WINNT/client_exp

Modified Files:
	resource.h 
Log Message:
DELTA resource-20040403
AUTHOR jaltman@mit.edu

conflict resolution



--- DELTA config follows ---
resource-20040403 openafs/src/WINNT/client_exp/resource.h 1.5 1.6