aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-06-02 10:37:05 +0200
committerHenrik Nord <[email protected]>2015-06-02 10:37:05 +0200
commitd67837c4646a7a94d2f1a7dd6b871335bf618290 (patch)
tree732073627bdfeb3b6e260ea5e2c7e2bdd53753b0 /lib/ssh
parentb37c4e256dfd827cdfcb92078c1217a13aa2e656 (diff)
downloadotp-d67837c4646a7a94d2f1a7dd6b871335bf618290.tar.gz
otp-d67837c4646a7a94d2f1a7dd6b871335bf618290.tar.bz2
otp-d67837c4646a7a94d2f1a7dd6b871335bf618290.zip
correct merge conflict
Diffstat (limited to 'lib/ssh')
-rw-r--r--lib/ssh/src/ssh.erl6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 10b526ba28..4a07473f74 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -360,13 +360,9 @@ handle_option([{exec, _} = Opt | Rest], SocketOptions, SshOptions) ->
handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
handle_option([{auth_methods, _} = Opt | Rest], SocketOptions, SshOptions) ->
handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
-<<<<<<< HEAD
-handle_option([{preferred_algorithms,_} = Opt | Rest], SocketOptions, SshOptions) ->
-=======
handle_option([{auth_method_kb_interactive_data, _} = Opt | Rest], SocketOptions, SshOptions) ->
handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
-handle_option([{pref_public_key_algs, _} = Opt | Rest], SocketOptions, SshOptions) ->
->>>>>>> maint
+handle_option([{preferred_algorithms,_} = Opt | Rest], SocketOptions, SshOptions) ->
handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
handle_option([{quiet_mode, _} = Opt|Rest], SocketOptions, SshOptions) ->
handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);