Fix merge

Author: quinnj

src/ssl.jl

@@ -60,18 +60,13 @@ end
 
 function on_bio_stream_write(bio::BIO, in::Ptr{Cchar}, inlen::Cint)::Cint
     try
-<<<<<<< Updated upstream
-        io = bio_get_data(bio)::TCPSocket
-        written = unsafe_write(io, in, inlen)
-=======
         bio_clear_flags(bio)
         io = bio_get_data(bio)
         if io isa TCPSocket
             written = unsafe_write(io, in, inlen)
         else
             written = unsafe_write(io, in, inlen)
         end
->>>>>>> Stashed changes
         return Cint(written)
     catch e
         # we don't want to throw a Julia exception from a C callback