diff options
Diffstat (limited to 'src/libtls/tls.h')
| -rw-r--r-- | src/libtls/tls.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libtls/tls.h b/src/libtls/tls.h index 1908f5dd4..f929f43fc 100644 --- a/src/libtls/tls.h +++ b/src/libtls/tls.h @@ -202,7 +202,11 @@ struct tls_t { /** * Check if TLS negotiation completed successfully. * +<<<<<<< HEAD * @return TRUE if TLS negotation and authentication complete +======= + * @return TRUE if TLS negotiation and authentication complete +>>>>>>> upstream/4.5.1 */ bool (*is_complete)(tls_t *this); |