aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorMarcus Arendt <marcus@erlang.org>2014-12-17 09:34:24 +0100
committerMarcus Arendt <marcus@erlang.org>2014-12-17 09:34:24 +0100
commit2d3cb60287e158e2cbc48e9b8a0b87b00267544b (patch)
treeb056bda51089f0f99f0baba58d11aeb19ee74bd2 /erts
parent595606579b1170cdb89222aa3826439f457cccc1 (diff)
parent1ea751ec08fcc5d190b0c2bc3dd455a4dc1feb06 (diff)
downloadotp-2d3cb60287e158e2cbc48e9b8a0b87b00267544b.tar.gz
otp-2d3cb60287e158e2cbc48e9b8a0b87b00267544b.tar.bz2
otp-2d3cb60287e158e2cbc48e9b8a0b87b00267544b.zip
Merge branch 'marcus/revert-ssh-testcase2/OTP-12004' into maint
* marcus/revert-ssh-testcase2/OTP-12004: fix failed conflict resolution
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions