From f7146cb3676239dcbe727c9cfd4582e91de40076 Mon Sep 17 00:00:00 2001
From: itojun <itojun@NetBSD.org>
Date: Tue, 27 Nov 2001 04:11:23 +0000
Subject: [PATCH] resolve one more conflict

---
 crypto/dist/ssh/sshd.8 | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/crypto/dist/ssh/sshd.8 b/crypto/dist/ssh/sshd.8
index 7275a0571647..fb8011330bb9 100644
--- a/crypto/dist/ssh/sshd.8
+++ b/crypto/dist/ssh/sshd.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sshd.8,v 1.18 2001/11/27 04:10:26 itojun Exp $
+.\"	$NetBSD: sshd.8,v 1.19 2001/11/27 04:11:23 itojun Exp $
 .\"  -*- nroff -*-
 .\"
 .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -35,13 +35,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-<<<<<<< sshd.8
-.\" $OpenBSD: sshd.8,v 1.153 2001/09/27 17:53:24 camield Exp $
-.Dd June 18, 2001
-=======
 .\" $OpenBSD: sshd.8,v 1.154 2001/11/07 22:12:01 markus Exp $
 .Dd September 25, 1999
->>>>>>> 1.1.1.12
 .Dt SSHD 8
 .Os
 .Sh NAME