summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTristan Sloughter <tristan.sloughter@gmail.com>2015-02-24 19:15:16 -0600
committerTristan Sloughter <tristan.sloughter@gmail.com>2015-02-24 19:15:16 -0600
commitba2e2cb32811358c200d144d95209972487529b7 (patch)
tree36599dea2e020098b21b26937ad603552f57d1a2 /src
parentef83d4e82153bb4142c116286d1f96ffeff8676a (diff)
parent235436a41090e45397e97c33cf0ef9d3413fc23c (diff)
Merge pull request #182 from tsloughter/profile_tests
profiles: combine lists of values for conflicting config options
Diffstat (limited to 'src')
-rw-r--r--src/rebar_state.erl4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/rebar_state.erl b/src/rebar_state.erl
index 70aba51..09f1c43 100644
--- a/src/rebar_state.erl
+++ b/src/rebar_state.erl
@@ -207,9 +207,7 @@ merge_opts(Profile, NewOpts, OldOpts) ->
true ->
NewValue;
false ->
- lists:keymerge(1
- ,lists:keysort(1, OldValue)
- ,lists:keysort(1, NewValue))
+ OldValue ++ NewValue
end;
(_Key, NewValue, _OldValue) ->
NewValue