Skip to content

Commit 13bb6a7

Browse files
committed
fixup! additional should not be merged
1 parent 8d55c1b commit 13bb6a7

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

lib/config.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,12 @@ export function getMergedConfig(dir, home, additional) {
3434
...Object.getOwnPropertyDescriptors(localConfig),
3535
});
3636
}
37-
return additional ? Object.create(null, {
37+
return additional
38+
? Object.create(null, {
3839
...Object.getOwnPropertyDescriptors(mergedConfig),
3940
...Object.getOwnPropertyDescriptors(additional),
40-
}) : mergedConfig;
41+
})
42+
: mergedConfig;
4143
};
4244
export function clearCachedConfig() {
4345
mergedConfig = null;

0 commit comments

Comments
 (0)