diff options
| author | des <des@FreeBSD.org> | 2002-10-29 10:16:02 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-10-29 10:16:02 +0000 |
| commit | 279b0fa809e30e3a007bbc4b2adb1ccbd4d4a87a (patch) | |
| tree | 404fa392fc6f2560e3c459fa20228c7031d0289d /crypto/openssh/sshlogin.h | |
| parent | ce26c10eda4d687d476e9bbac51ccd26564af8da (diff) | |
| download | FreeBSD-src-279b0fa809e30e3a007bbc4b2adb1ccbd4d4a87a.zip FreeBSD-src-279b0fa809e30e3a007bbc4b2adb1ccbd4d4a87a.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/sshlogin.h')
| -rw-r--r-- | crypto/openssh/sshlogin.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/sshlogin.h b/crypto/openssh/sshlogin.h index 9f0d5f0..2bf9e0d 100644 --- a/crypto/openssh/sshlogin.h +++ b/crypto/openssh/sshlogin.h @@ -1,5 +1,5 @@ -/* $OpenBSD: sshlogin.h,v 1.3 2001/06/26 17:27:25 markus Exp $ */ -/* $FreeBSD$ */ +/* $OpenBSD: sshlogin.h,v 1.4 2002/08/29 15:57:25 stevesk Exp $ */ +/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> |
