Skip to content

Commit

Permalink
Fix param merging
Browse files Browse the repository at this point in the history
  • Loading branch information
zackseuberling committed Nov 20, 2019
1 parent 1a32ca0 commit 49e067a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/core/mergeConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ module.exports = function mergeConfig(config1, config2) {
config2 = config2 || {};
var config = {};

var valueFromConfig2Keys = ['url', 'method', 'params', 'data'];
var mergeDeepPropertiesKeys = ['headers', 'auth', 'proxy'];
var valueFromConfig2Keys = ['url', 'method', 'data'];
var mergeDeepPropertiesKeys = ['headers', 'auth', 'params', 'proxy'];
var defaultToConfig2Keys = [
'baseURL', 'url', 'transformRequest', 'transformResponse', 'paramsSerializer',
'timeout', 'withCredentials', 'adapter', 'responseType', 'xsrfCookieName',
Expand Down

0 comments on commit 49e067a

Please sign in to comment.