From e9a1eddb862b77a4db206b59d13f6a2c7b91fb11 Mon Sep 17 00:00:00 2001 From: christos Date: Fri, 27 Dec 2013 20:11:26 +0000 Subject: [PATCH] remove conflicts --- external/bsd/openpam/dist/doc/man/pam_get_authtok.3 | 5 +---- external/bsd/openpam/dist/doc/man/pam_get_user.3 | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/external/bsd/openpam/dist/doc/man/pam_get_authtok.3 b/external/bsd/openpam/dist/doc/man/pam_get_authtok.3 index b996b45f1d9b..89b0f122ef45 100644 --- a/external/bsd/openpam/dist/doc/man/pam_get_authtok.3 +++ b/external/bsd/openpam/dist/doc/man/pam_get_authtok.3 @@ -1,4 +1,4 @@ -.\" $NetBSD: pam_get_authtok.3,v 1.4 2013/12/27 20:10:20 christos Exp $ +.\" $NetBSD: pam_get_authtok.3,v 1.5 2013/12/27 20:11:26 christos Exp $ .\" .\" Generated from pam_get_authtok.c by gendoc.pl .\" Id: pam_get_authtok.c 670 2013-03-17 19:26:07Z des @@ -76,8 +76,6 @@ If there is a mismatch, .Fn pam_get_authtok will return .Dv PAM_TRY_AGAIN . -<<<<<<< pam_get_authtok.3 -======= .Sh MODULE OPTIONS When called by a service module, .Fn pam_get_authtok @@ -122,7 +120,6 @@ value, or .Dv PAM_AUTH_ERR if there is none. .El ->>>>>>> 1.1.1.3 .Sh RETURN VALUES The .Fn pam_get_authtok diff --git a/external/bsd/openpam/dist/doc/man/pam_get_user.3 b/external/bsd/openpam/dist/doc/man/pam_get_user.3 index da4fc3b00ec0..1d7039c81ab0 100644 --- a/external/bsd/openpam/dist/doc/man/pam_get_user.3 +++ b/external/bsd/openpam/dist/doc/man/pam_get_user.3 @@ -1,4 +1,4 @@ -.\" $NetBSD: pam_get_user.3,v 1.4 2013/12/27 20:10:20 christos Exp $ +.\" $NetBSD: pam_get_user.3,v 1.5 2013/12/27 20:11:26 christos Exp $ .\" .\" Generated from pam_get_user.c by gendoc.pl .\" Id: pam_get_user.c 670 2013-03-17 19:26:07Z des @@ -64,10 +64,7 @@ This option overrides both the argument and the .Dv PAM_USER_PROMPT item. -<<<<<<< pam_get_user.3 -======= .El ->>>>>>> 1.1.1.3 .Sh RETURN VALUES The .Fn pam_get_user