From 6163856b3bd78d1948a8e9e91e646d6c169aa310 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Thu, 11 Oct 2018 12:32:41 +0200 Subject: ssl: Fix up incorrect automatic merge --- lib/ssl/src/tls_sender.erl | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lib/ssl/src/tls_sender.erl b/lib/ssl/src/tls_sender.erl index e9383998ce..8d1938cee7 100644 --- a/lib/ssl/src/tls_sender.erl +++ b/lib/ssl/src/tls_sender.erl @@ -110,13 +110,6 @@ send_and_ack_alert(Pid, Alert) -> setopts(Pid, Opts) -> call(Pid, {set_opts, Opts}). -%%-------------------------------------------------------------------- --spec setopts(pid(), [{packet, integer() | atom()}]) -> ok | {error, term()}. -%% Description: Send application data -%%-------------------------------------------------------------------- -setopts(Pid, Opts) -> - call(Pid, {set_opts, Opts}). - %%-------------------------------------------------------------------- -spec renegotiate(pid()) -> {ok, WriteState::map()} | {error, closed}. %% Description: So TLS connection process can synchronize the -- cgit v1.2.3