aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/ssh/test/ssh.spec9
1 files changed, 0 insertions, 9 deletions
diff --git a/lib/ssh/test/ssh.spec b/lib/ssh/test/ssh.spec
index c420b119ac..8de0fe44e4 100644
--- a/lib/ssh/test/ssh.spec
+++ b/lib/ssh/test/ssh.spec
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
{suites,"../ssh_test",all}.
{skip_cases,"../ssh_test",ssh_ssh_SUITE,
[ssh],
@@ -6,11 +5,3 @@
{skip_cases,"../ssh_test",ssh_ssh_SUITE,
[ssh_compressed],
"Current implementation is timingdependent hence will succeed/fail on a whim"}.
-=======
-{topcase, {dir, "../ssh_test"}}.
-{require_nodenames, 1}.
-{skip, {ssh_ssh_SUITE, ssh, "Current implementation is timingdependent and
-hence will succeed/fail on a whim"}}.
-{skip, {ssh_ssh_SUITE, ssh_compressed,
-"Current implementation is timingdependent hence will succeed/fail on a whim"}}.
->>>>>>> Add test suite for ssh