Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve one more conflict

This commit is contained in:
itojun 2001-11-27 04:11:23 +00:00
parent ce0e2b2976
commit f7146cb367
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/dist/ssh/sshd.8 vendored
View File

@ -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