Revert "Revert "Master""

This reverts commit 400d046746.
This commit is contained in:
alisdair sullivan 2015-08-04 11:26:00 -07:00
parent f3894b827b
commit 9d4534edc5
6 changed files with 39 additions and 16 deletions

View file

@ -58,8 +58,6 @@
-endif.
-spec consult(File::file:name_all(), Config::config()) -> [json_value()].
-ifdef(maps_always).
opts(Opts) -> [return_maps, multi_term] ++ Opts.
-endif.
@ -67,6 +65,8 @@ opts(Opts) -> [return_maps, multi_term] ++ Opts.
opts(Opts) -> [multi_term] ++ Opts.
-endif.
-spec consult(File::file:name_all(), Config::config()) -> [json_value()].
consult(File, Config) when is_list(Config) ->
case file:read_file(File) of
{ok, Bin} ->