[src/trunk]: src/external/bsd/openpam/dist resolve conflicts

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

details:   https://anonhg.NetBSD.org/src/rev/dd002c72ffb4
branches:  trunk
changeset: 803380:dd002c72ffb4
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Oct 24 18:27:12 2014 +0000

description:
resolve conflicts

diffstat:

 external/bsd/openpam/dist/bin/pamtest/pamtest.1           |  5 +----
 external/bsd/openpam/dist/bin/pamtest/pamtest.c           |  5 +----
 external/bsd/openpam/dist/bin/su/su.1                     |  5 +----
 external/bsd/openpam/dist/bin/su/su.c                     |  5 +----
 external/bsd/openpam/dist/modules/pam_deny/pam_deny.c     |  5 +----
 external/bsd/openpam/dist/modules/pam_permit/pam_permit.c |  5 +----
 external/bsd/openpam/dist/modules/pam_unix/pam_unix.c     |  5 +----
 7 files changed, 7 insertions(+), 28 deletions(-)

diffs (91 lines):

diff -r 6bee28a60c34 -r dd002c72ffb4 external/bsd/openpam/dist/bin/pamtest/pamtest.1
--- a/external/bsd/openpam/dist/bin/pamtest/pamtest.1   Fri Oct 24 18:25:14 2014 +0000
+++ b/external/bsd/openpam/dist/bin/pamtest/pamtest.1   Fri Oct 24 18:27:12 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< pamtest.1
-.\"    $NetBSD: pamtest.1,v 1.6 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: pamtest.1,v 1.7 2014/10/24 18:27:12 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.4
 .\"-
 .\" Copyright (c) 2011 Dag-Erling Smørgrav
 .\" All rights reserved.
diff -r 6bee28a60c34 -r dd002c72ffb4 external/bsd/openpam/dist/bin/pamtest/pamtest.c
--- a/external/bsd/openpam/dist/bin/pamtest/pamtest.c   Fri Oct 24 18:25:14 2014 +0000
+++ b/external/bsd/openpam/dist/bin/pamtest/pamtest.c   Fri Oct 24 18:27:12 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< pamtest.c
-/*     $NetBSD: pamtest.c,v 1.5 2014/10/24 18:17:56 christos Exp $     */
+/*     $NetBSD: pamtest.c,v 1.6 2014/10/24 18:27:12 christos Exp $     */
 
-=======
->>>>>>> 1.1.1.4
 /*-
  * Copyright (c) 2011 Dag-Erling Smørgrav
  * All rights reserved.
diff -r 6bee28a60c34 -r dd002c72ffb4 external/bsd/openpam/dist/bin/su/su.1
--- a/external/bsd/openpam/dist/bin/su/su.1     Fri Oct 24 18:25:14 2014 +0000
+++ b/external/bsd/openpam/dist/bin/su/su.1     Fri Oct 24 18:27:12 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< su.1
-.\"    $NetBSD: su.1,v 1.6 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: su.1,v 1.7 2014/10/24 18:27:12 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.4
 .\"-
 .\" Copyright (c) 2011 Dag-Erling Smørgrav
 .\" All rights reserved.
diff -r 6bee28a60c34 -r dd002c72ffb4 external/bsd/openpam/dist/bin/su/su.c
--- a/external/bsd/openpam/dist/bin/su/su.c     Fri Oct 24 18:25:14 2014 +0000
+++ b/external/bsd/openpam/dist/bin/su/su.c     Fri Oct 24 18:27:12 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< su.c
-/*     $NetBSD: su.c,v 1.5 2014/10/24 18:17:56 christos Exp $  */
+/*     $NetBSD: su.c,v 1.6 2014/10/24 18:27:12 christos Exp $  */
 
-=======
->>>>>>> 1.1.1.4
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
  * Copyright (c) 2004-2011 Dag-Erling Smørgrav
diff -r 6bee28a60c34 -r dd002c72ffb4 external/bsd/openpam/dist/modules/pam_deny/pam_deny.c
--- a/external/bsd/openpam/dist/modules/pam_deny/pam_deny.c     Fri Oct 24 18:25:14 2014 +0000
+++ b/external/bsd/openpam/dist/modules/pam_deny/pam_deny.c     Fri Oct 24 18:27:12 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< pam_deny.c
-/*     $NetBSD: pam_deny.c,v 1.5 2014/10/24 18:17:57 christos Exp $    */
+/*     $NetBSD: pam_deny.c,v 1.6 2014/10/24 18:27:13 christos Exp $    */
 
-=======
->>>>>>> 1.1.1.4
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
  * Copyright (c) 2004-2011 Dag-Erling Smørgrav
diff -r 6bee28a60c34 -r dd002c72ffb4 external/bsd/openpam/dist/modules/pam_permit/pam_permit.c
--- a/external/bsd/openpam/dist/modules/pam_permit/pam_permit.c Fri Oct 24 18:25:14 2014 +0000
+++ b/external/bsd/openpam/dist/modules/pam_permit/pam_permit.c Fri Oct 24 18:27:12 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< pam_permit.c
-/*     $NetBSD: pam_permit.c,v 1.5 2014/10/24 18:17:57 christos Exp $  */
+/*     $NetBSD: pam_permit.c,v 1.6 2014/10/24 18:27:13 christos Exp $  */
 
-=======
->>>>>>> 1.1.1.4
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
  * Copyright (c) 2004-2011 Dag-Erling Smørgrav
diff -r 6bee28a60c34 -r dd002c72ffb4 external/bsd/openpam/dist/modules/pam_unix/pam_unix.c
--- a/external/bsd/openpam/dist/modules/pam_unix/pam_unix.c     Fri Oct 24 18:25:14 2014 +0000
+++ b/external/bsd/openpam/dist/modules/pam_unix/pam_unix.c     Fri Oct 24 18:27:12 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< pam_unix.c
-/*     $NetBSD: pam_unix.c,v 1.5 2014/10/24 18:17:57 christos Exp $    */
+/*     $NetBSD: pam_unix.c,v 1.6 2014/10/24 18:27:13 christos Exp $    */
 
-=======
->>>>>>> 1.1.1.4
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
  * Copyright (c) 2004-2011 Dag-Erling Smørgrav