Complete TLS merge

Former-commit-id: 856d23023259d59ce766e9cd00526de0e7d06c2f
2020-05-26 01:38:29 -04:00 · 2020-05-26 01:38:29 -04:00 · ef32f81fd9
commit ef32f81fd9
parent f617eafbe1
1 changed files with 0 additions and 3 deletions
--- a/src/tls.cpp
+++ b/src/tls.cpp
@ -898,10 +898,7 @@ ConnectionType CT_TLS = {
    connTLSSyncWrite,
    connTLSSyncRead,
    connTLSSyncReadLine,
-<<<<<<< HEAD
-=======
    connTLSMarshalThread,
->>>>>>> unstable
 };

 int tlsHasPendingData() {