diff options
| author | des <des@FreeBSD.org> | 2004-04-20 09:47:13 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-04-20 09:47:13 +0000 |
| commit | 6e7fa35a0a238ccf98f0f7958057952d9e467901 (patch) | |
| tree | 9e2742312d693ce54ffc59361c69c481790343d5 /crypto | |
| parent | e5d801b2d6aab34943ecb74550a852aa69c82f38 (diff) | |
| download | FreeBSD-src-6e7fa35a0a238ccf98f0f7958057952d9e467901.zip FreeBSD-src-6e7fa35a0a238ccf98f0f7958057952d9e467901.tar.gz | |
One more conflict.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/openssh/readconf.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index 9cc6ce7..c62b943 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -106,12 +106,8 @@ typedef enum { oClearAllForwardings, oNoHostAuthenticationForLocalhost, oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, oAddressFamily, oGssAuthentication, oGssDelegateCreds, -<<<<<<< readconf.c - oServerAliveInterval, oServerAliveCountMax, - oVersionAddendum, -======= oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, ->>>>>>> 1.1.1.15 + oVersionAddendum, oDeprecated, oUnsupported } OpCodes; |
