From 235436a41090e45397e97c33cf0ef9d3413fc23c Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Tue, 24 Feb 2015 08:24:26 -0600
Subject: profiles: combine lists of values for conflicting config options

---
 src/rebar_state.erl | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src')

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
-- 
cgit v1.1