From ef32f81fd967ce353eb5370e5d23c685676aa0a8 Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Tue, 26 May 2020 01:38:29 -0400
Subject: [PATCH] Complete TLS merge

Former-commit-id: 856d23023259d59ce766e9cd00526de0e7d06c2f
---
 src/tls.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/tls.cpp b/src/tls.cpp
index c125eabc2..d297695cc 100644
--- a/src/tls.cpp
+++ b/src/tls.cpp
@@ -898,10 +898,7 @@ ConnectionType CT_TLS = {
     connTLSSyncWrite,
     connTLSSyncRead,
     connTLSSyncReadLine,
-<<<<<<< HEAD
-=======
     connTLSMarshalThread,
->>>>>>> unstable
 };
 
 int tlsHasPendingData() {