Browse Source

Merge pull request #173 from talentdeficit/empty_locks_fix

don't attempt to merge locks when there are no dependencies
pull/176/head
Tristan Sloughter 10 years ago
parent
commit
4b9adefcb8
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      src/rebar_config.erl

+ 1
- 1
src/rebar_config.erl View File

@ -60,7 +60,7 @@ consult_file(File) ->
end end
end. end.
merge_locks(Config, []) ->
merge_locks(Config, [[]]) ->
Config; Config;
merge_locks(Config, [Locks]) -> merge_locks(Config, [Locks]) ->
{deps, ConfigDeps} = lists:keyfind(deps, 1, Config), {deps, ConfigDeps} = lists:keyfind(deps, 1, Config),

Loading…
Cancel
Save