merge misresolve

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)