Mercurial > dropbear
diff svr-authpam.c @ 1068:9a6395ddb1b6 pam
resolve merge properly
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Fri, 23 Jan 2015 22:32:49 +0800 |
parents | bae0b34bc059 |
children | 696205e3dc99 |
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Fri, 23 Jan 2015 22:32:49 +0800 |
parents | bae0b34bc059 |
children | 696205e3dc99 |