aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/doc
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-11-24 10:50:23 +0100
committerIngela Anderton Andin <[email protected]>2017-11-24 11:21:20 +0100
commitb27269618782a033862df2f135cbff7073b30d69 (patch)
tree5d48cf2c12f5ad7bb14dc5cf857456b59fcb202d /lib/kernel/doc
parent1678e021c603d0cbc9d951da4facc6e959e5f277 (diff)
downloadotp-b27269618782a033862df2f135cbff7073b30d69.tar.gz
otp-b27269618782a033862df2f135cbff7073b30d69.tar.bz2
otp-b27269618782a033862df2f135cbff7073b30d69.zip
ssl: Fix incorrect merge conflict resolution
When handling merging of back ported Counter measurements for Bleichenbacher attack a line from DTLS was accidentally lost.
Diffstat (limited to 'lib/kernel/doc')
0 files changed, 0 insertions, 0 deletions