diff options
author | Sam Hartman <hartmans@painless-security.com> | 2013-09-30 13:19:11 -0400 |
---|---|---|
committer | Sam Hartman <hartmans@painless-security.com> | 2013-09-30 13:19:11 -0400 |
commit | dbd1950db1fbd668e0b9989d2096ee11e3ea3bc7 (patch) | |
tree | 5a557851d71b299f93a52b7868692160e698a91d | |
parent | 20aec869d43ecd1d1ba168170211496472ace822 (diff) |
merge misresolve
-rw-r--r-- | lib/tls.c | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -15,13 +15,8 @@ #include <radsec/radsec-impl.h> #include <regex.h> -<<<<<<< HEAD -#include "rsp_list.h" -#include "radsecproxy.h" -======= #include "radsecproxy/list.h" #include "radsecproxy/radsecproxy.h" ->>>>>>> moonshot static struct tls * _get_tlsconf (struct rs_connection *conn, const struct rs_realm *realm) |