From 1ea751ec08fcc5d190b0c2bc3dd455a4dc1feb06 Mon Sep 17 00:00:00 2001
From: Marcus Arendt <marcus@erlang.org>
Date: Wed, 10 Dec 2014 09:34:36 +0100
Subject: fix failed conflict resolution

---
 lib/ssh/test/ssh_connection_SUITE.erl | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib/ssh')

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,
-- 
cgit v1.2.3