From 82030ae054ba10bbd25ef00b304990632780f11d Mon Sep 17 00:00:00 2001 From: Martti Laine Date: Tue, 3 Apr 2018 21:53:17 +0200 Subject: [PATCH] Use deepMerge in deepMerge --- lib/utils.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/utils.js b/lib/utils.js index 856aba3..aca5f4e 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -272,9 +272,9 @@ function deepMerge(/* obj1, obj2, obj3, ... */) { var result = {}; function assignValue(val, key) { if (typeof result[key] === 'object' && typeof val === 'object') { - result[key] = merge(result[key], val); + result[key] = deepMerge(result[key], val); } else if (typeof val === 'object') { - result[key] = merge({}, val); + result[key] = deepMerge({}, val); } else { result[key] = val; }