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.
Modified files:
Index: src/external/bsd/openpam/dist/doc/man/pam.conf.5
diff -u src/external/bsd/openpam/dist/doc/man/pam.conf.5:1.7 src/external/bsd/openpam/dist/doc/man/pam.conf.5:1.8
--- src/external/bsd/openpam/dist/doc/man/pam.conf.5:1.7 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam.conf.5 Fri Oct 24 14:25:42 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam.conf.5
-.\" $NetBSD: pam.conf.5,v 1.7 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam.conf.5,v 1.8 2014/10/24 18:25:42 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\"-
.\" Copyright (c) 2005-2011 Dag-Erling Smørgrav
.\" All rights reserved.
