aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2014-09-24 12:35:17 +0200
committerBjörn-Egil Dahlberg <[email protected]>2014-09-24 12:35:17 +0200
commitf2d08e107a735529e5ec8815d3cac530d77ba8c6 (patch)
tree83672c6c54822bec92ec3af86e20440093992f35 /lib
parent8c8bd46bcc9d839e5de0687784d15dc819cb3ee8 (diff)
parent24cc30822a41893e2cd2cc02a5ced67f2e706481 (diff)
downloadotp-f2d08e107a735529e5ec8815d3cac530d77ba8c6.tar.gz
otp-f2d08e107a735529e5ec8815d3cac530d77ba8c6.tar.bz2
otp-f2d08e107a735529e5ec8815d3cac530d77ba8c6.zip
Merge branch 'egil/fix-master-merge'
* egil/fix-master-merge: erl_docgen: Fix maint to master merge of OTP-11947
Diffstat (limited to 'lib')
-rw-r--r--lib/erl_docgen/src/docgen_otp_specs.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/erl_docgen/src/docgen_otp_specs.erl b/lib/erl_docgen/src/docgen_otp_specs.erl
index 1075c47801..e2eee2b3c0 100644
--- a/lib/erl_docgen/src/docgen_otp_specs.erl
+++ b/lib/erl_docgen/src/docgen_otp_specs.erl
@@ -616,7 +616,7 @@ ot_map(Es) ->
{type,0,map,[ot_map_field(E) || E <- get_elem(map_field,Es)]}.
ot_map_field(#xmlElement{content=[K,V]}) ->
- {type,0,map_field_assoc, ot_utype_elem(K), ot_utype_elem(V)}.
+ {type,0,map_field_assoc,[ot_utype_elem(K),ot_utype_elem(V)]}.
ot_fun(Es) ->
Range = ot_utype(get_elem(type, Es)),