diff options
| author | Tristan Sloughter <tristan.sloughter@gmail.com> | 2015-02-22 18:23:15 -0600 |
|---|---|---|
| committer | Tristan Sloughter <tristan.sloughter@gmail.com> | 2015-02-22 18:23:15 -0600 |
| commit | 4b9adefcb844111607891c9d7071794764126fc7 (patch) | |
| tree | d6073996ad624ec97ee34179fb19c27a6292cee6 | |
| parent | 558646adbc044d85aae4d972682d008a9c7554c7 (diff) | |
| parent | 04235f1a63ebfec1b6fbd1b6c5ed9b6a2853b8a8 (diff) | |
Merge pull request #173 from talentdeficit/empty_locks_fix
don't attempt to merge locks when there are no dependencies
| -rw-r--r-- | src/rebar_config.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rebar_config.erl b/src/rebar_config.erl index 36d6b18..63b7af7 100644 --- a/src/rebar_config.erl +++ b/src/rebar_config.erl @@ -60,7 +60,7 @@ consult_file(File) -> end end. -merge_locks(Config, []) -> +merge_locks(Config, [[]]) -> Config; merge_locks(Config, [Locks]) -> {deps, ConfigDeps} = lists:keyfind(deps, 1, Config), |