[src/trunk]: src/external/bsd/openpam/dist/doc/man remove conflicts

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a4425241d3ab
branches:  trunk
changeset: 325513:a4425241d3ab
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Dec 27 20:11:26 2013 +0000

description:
remove conflicts

diffstat:

 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(-)

diffs (46 lines):

diff -r f78881b08acc -r a4425241d3ab external/bsd/openpam/dist/doc/man/pam_get_authtok.3
--- a/external/bsd/openpam/dist/doc/man/pam_get_authtok.3       Fri Dec 27 20:10:20 2013 +0000
+++ b/external/bsd/openpam/dist/doc/man/pam_get_authtok.3       Fri Dec 27 20:11:26 2013 +0000
@@ -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 @@
 .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 @@
 .Dv PAM_AUTH_ERR
 if there is none.
 .El
->>>>>>> 1.1.1.3
 .Sh RETURN VALUES
 The
 .Fn pam_get_authtok
diff -r f78881b08acc -r a4425241d3ab external/bsd/openpam/dist/doc/man/pam_get_user.3
--- a/external/bsd/openpam/dist/doc/man/pam_get_user.3  Fri Dec 27 20:10:20 2013 +0000
+++ b/external/bsd/openpam/dist/doc/man/pam_get_user.3  Fri Dec 27 20:11:26 2013 +0000
@@ -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 @@
 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