projects
/
libradsec.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
20aec86
)
merge misresolve
author
Sam Hartman
<hartmans@painless-security.com>
Mon, 30 Sep 2013 17:19:11 +0000
(13:19 -0400)
committer
Sam Hartman
<hartmans@painless-security.com>
Mon, 30 Sep 2013 17:19:11 +0000
(13:19 -0400)
lib/tls.c
patch
|
blob
|
history
diff --git
a/lib/tls.c
b/lib/tls.c
index
f7d4256
..
62e219e
100644
(file)
--- a/
lib/tls.c
+++ b/
lib/tls.c
@@
-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)