openssh: Fix some merging mistakes I made.
authorSascha Wildner <saw@online.de>
Tue, 24 Jul 2018 11:40:42 +0000 (13:40 +0200)
committerSascha Wildner <saw@online.de>
Tue, 24 Jul 2018 11:40:42 +0000 (13:40 +0200)
commitac187a8194cc6816be20814fe6636b88a513d971
treeccf1fae8c775b9e3b4275ce7fc81ee3d6b983c0b
parentb11ab2469a6c213f1f13d8343b2f7cecea15a6a6
openssh: Fix some merging mistakes I made.
crypto/openssh/README.DELETED [new file with mode: 0644]
crypto/openssh/session.c
crypto/openssh/sftp-common.c