aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_message.c
diff options
context:
space:
mode:
authorZandra <[email protected]>2015-12-04 10:26:39 +0100
committerZandra <[email protected]>2015-12-04 10:26:39 +0100
commit646d3d24a9031c96f726b9a2c715b6da144334c8 (patch)
tree8100ef8a3329040f0c728e3b589feb5708a227cf /erts/emulator/beam/erl_message.c
parentfc571c1a5d505902c15742e7c0db60288d63fcdb (diff)
parentd4bf329e7975eca4eab3522766785b3ae624aa8f (diff)
downloadotp-646d3d24a9031c96f726b9a2c715b6da144334c8.tar.gz
otp-646d3d24a9031c96f726b9a2c715b6da144334c8.tar.bz2
otp-646d3d24a9031c96f726b9a2c715b6da144334c8.zip
Merge branch 'zandra/rm-eunit-assertReceive' into maint
* zandra/rm-eunit-assertReceive: rm assertReceive, due to a leftover of a conflict resolution
Diffstat (limited to 'erts/emulator/beam/erl_message.c')
0 files changed, 0 insertions, 0 deletions