diff options
author | des <des@FreeBSD.org> | 2006-11-10 16:52:41 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2006-11-10 16:52:41 +0000 |
commit | f486315183c122f23f1b35b42ac8dd3c2b635caa (patch) | |
tree | 538ffcf6acb6ece62b0734e0707ef5a1e8efbd7a /crypto/openssh/ssh.c | |
parent | 11e3a8c8c1e6142fc51e7fc357907b54bd433aa7 (diff) | |
download | FreeBSD-src-f486315183c122f23f1b35b42ac8dd3c2b635caa.zip FreeBSD-src-f486315183c122f23f1b35b42ac8dd3c2b635caa.tar.gz |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/ssh.c')
-rw-r--r-- | crypto/openssh/ssh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssh/ssh.c b/crypto/openssh/ssh.c index bb3c810..67844a9 100644 --- a/crypto/openssh/ssh.c +++ b/crypto/openssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.293 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: ssh.c,v 1.294 2006/10/06 02:29:19 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |