@@ -31,11 +31,11 @@ export default function mergeConfig(config1, config2) {
3131 }
3232
3333 // eslint-disable-next-line consistent-return
34- function mergeDeepProperties ( a , b , prop , caseless ) {
34+ function mergeDeepProperties ( a , b , prop , caseless ) {
3535 if ( ! utils . isUndefined ( b ) ) {
36- return getMergedValue ( a , b , prop , caseless ) ;
36+ return getMergedValue ( a , b , prop , caseless ) ;
3737 } else if ( ! utils . isUndefined ( a ) ) {
38- return getMergedValue ( undefined , a , prop , caseless ) ;
38+ return getMergedValue ( undefined , a , prop , caseless ) ;
3939 }
4040 }
4141
@@ -93,7 +93,7 @@ export default function mergeConfig(config1, config2) {
9393 socketPath : defaultToConfig2 ,
9494 responseEncoding : defaultToConfig2 ,
9595 validateStatus : mergeDirectKeys ,
96- headers : ( a , b , prop ) => mergeDeepProperties ( headersToObject ( a ) , headersToObject ( b ) , prop , true )
96+ headers : ( a , b , prop ) => mergeDeepProperties ( headersToObject ( a ) , headersToObject ( b ) , prop , true )
9797 } ;
9898
9999 utils . forEach ( Object . keys ( { ...config1 , ...config2 } ) , function computeConfigValue ( prop ) {
0 commit comments