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/session.c | |
parent | 11e3a8c8c1e6142fc51e7fc357907b54bd433aa7 (diff) | |
download | FreeBSD-src-f486315183c122f23f1b35b42ac8dd3c2b635caa.zip FreeBSD-src-f486315183c122f23f1b35b42ac8dd3c2b635caa.tar.gz |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/session.c')
-rw-r--r-- | crypto/openssh/session.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssh/session.c b/crypto/openssh/session.c index fb33d49..a752e72 100644 --- a/crypto/openssh/session.c +++ b/crypto/openssh/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.219 2006/08/29 10:40:19 djm Exp $ */ +/* $OpenBSD: session.c,v 1.220 2006/10/09 23:36:11 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved |