Module Name: src Committed By: christos Date: Fri Dec 27 20:11:27 UTC 2013
Modified Files:
src/external/bsd/openpam/dist/doc/man: pam_get_authtok.3 pam_get_user.3
Log Message:
remove conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openpam/dist/doc/man/pam_get_authtok.3 \
src/external/bsd/openpam/dist/doc/man/pam_get_user.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
