Fix bad merge

diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c
index 2c971a2fbcb8962f9cb1c5c64903bbe0726e7f78..3c98a285e0605818d8bc7039b988d99e9b61e3c0 100644 (file)
--- a/libraries/libldap/tls.c
+++ b/libraries/libldap/tls.c
@@ -891,14 +891,10 @@ ldap_pvt_tls_set_option( struct ldapoptions *lo, int option, void *arg )
 int
 ldap_pvt_tls_start ( LDAP *ld, Sockbuf *sb, void *ctx_arg )
 {
-<<<<<<< tls.c
-       ldap_pvt_tls_init();
-=======
        char *peer_cert_cn, *peer_hostname;
        void *ssl;
 
        (void) ldap_pvt_tls_init();
->>>>>>> 1.40
 
        /*
         * Fortunately, the lib uses blocking io...