aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-12-10 09:34:36 +0100
committerMarcus Arendt <[email protected]>2014-12-10 09:40:43 +0100
commit1ea751ec08fcc5d190b0c2bc3dd455a4dc1feb06 (patch)
treed5001a5615880fe0305efadebc3ad25f8e746cc2
parent6d0033735b0b75321fb70d5e2a7645533cc24250 (diff)
downloadotp-1ea751ec08fcc5d190b0c2bc3dd455a4dc1feb06.tar.gz
otp-1ea751ec08fcc5d190b0c2bc3dd455a4dc1feb06.tar.bz2
otp-1ea751ec08fcc5d190b0c2bc3dd455a4dc1feb06.zip
fix failed conflict resolution
-rw-r--r--lib/ssh/test/ssh_connection_SUITE.erl1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl
index 85bd2c75d4..a73573e7fe 100644
--- a/lib/ssh/test/ssh_connection_SUITE.erl
+++ b/lib/ssh/test/ssh_connection_SUITE.erl
@@ -37,7 +37,6 @@
all() ->
[
{group, openssh},
- {group, openssh_payload},
interrupted_send,
start_shell,
start_shell_exec,