Module Name:	src
Committed By:	skrll
Date:		Tue Nov 29 15:31:41 UTC 2005

Modified Files:
	src/gnu/dist/cvs/contrib: cvs_acls.in

Log Message:
Really resolve a conflict.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 src/gnu/dist/cvs/contrib/cvs_acls.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.