Remove bad cherry-pick

diff --git a/bacula/src/lib/bsock.c b/bacula/src/lib/bsock.c
index 3e7e233b32ebf47bcdedb156de2110aaa02cdfca..d947ba07480014e649a7abe8929b423be5e00dcb 100644 (file)
--- a/bacula/src/lib/bsock.c
+++ b/bacula/src/lib/bsock.c
@@ -932,15 +932,6 @@ int BSOCK::wait_data_intr(int sec, int usec)
       return -1;                /* error return */
    default:
       b_errno = 0;
-<<<<<<< HEAD
-=======
-#ifdef HAVE_TLS
-      if (this->tls && !tls_bsock_probe(this)) {
-         /* maybe a session key negotiation waked up the socket */
-         return 0;
-      }
-#endif
->>>>>>> 625e1f1... Fix compilation of bsock.c when TLS is not available
       break;
    }
    return 1;