aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/bif.tab
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2015-02-23 17:27:41 +0100
committerBjörn-Egil Dahlberg <[email protected]>2015-03-12 19:15:28 +0100
commit7ac42c5d31f7722907b44d2df3421f8cd88d48c5 (patch)
tree3f9298c1256f5f25802f39ade7078dcd8142bd88 /erts/emulator/beam/bif.tab
parent746d2d846ebf20fc4dc303c53bcd1e908aee924b (diff)
downloadotp-7ac42c5d31f7722907b44d2df3421f8cd88d48c5.tar.gz
otp-7ac42c5d31f7722907b44d2df3421f8cd88d48c5.tar.bz2
otp-7ac42c5d31f7722907b44d2df3421f8cd88d48c5.zip
erts: Move hashmap:merge/2 to maps
Diffstat (limited to 'erts/emulator/beam/bif.tab')
-rw-r--r--erts/emulator/beam/bif.tab3
1 files changed, 0 insertions, 3 deletions
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab
index f9127ef955..b4e821a986 100644
--- a/erts/emulator/beam/bif.tab
+++ b/erts/emulator/beam/bif.tab
@@ -615,9 +615,6 @@ bif erlang:fun_info_mfa/1
bif erlang:get_keys/0
bif erts_debug:map_info/1
-# Hash Array Mappped Trie
-bif hashmap:merge/2
-
#
# Obsolete
#