CVS commit: src/external/bsd/openpam/dist/doc/man

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Fri Oct 24 18:25:42 UTC 2014

Modified Files:
        src/external/bsd/openpam/dist/doc/man: pam.conf.5

Log Message:
fix conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/openpam/dist/doc/man/pam.conf.5

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