aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2011-10-19 16:28:10 +0200
committerRickard Green <[email protected]>2011-10-19 16:28:10 +0200
commitff1fb99fb54ef93cd778366993a448fde2b44d82 (patch)
tree855e6de5506f1b631a219482fec6e66aeddd7590 /erts/emulator
parent02ec67177b2f5d2de371362e5bb3c9b9771fb0b8 (diff)
downloadotp-ff1fb99fb54ef93cd778366993a448fde2b44d82.tar.gz
otp-ff1fb99fb54ef93cd778366993a448fde2b44d82.tar.bz2
otp-ff1fb99fb54ef93cd778366993a448fde2b44d82.zip
Fix erroneous merge resolution
Previously removed code erroneously reappeared in a merge to the master branch (ec36499d7e329b4dc69a1a3be3422eac7907c260).
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions