aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiclas Eklund <[email protected]>2011-03-03 16:23:47 +0100
committerNiclas Eklund <[email protected]>2011-05-19 14:38:19 +0200
commit37bd65a4615ca9692c8ef363151559a3fe22cda4 (patch)
treeb7c6468542b544b7fe11c8a4e71351e1c5cd6ce2
parenta23f044daea7526a649c788b1a81000d833b1a3e (diff)
downloadotp-37bd65a4615ca9692c8ef363151559a3fe22cda4.tar.gz
otp-37bd65a4615ca9692c8ef363151559a3fe22cda4.tar.bz2
otp-37bd65a4615ca9692c8ef363151559a3fe22cda4.zip
Resolved merge conflict.
-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