diff options
| author | eris <femmediscord@gmail.com> | 2021-07-22 20:46:41 +0000 |
|---|---|---|
| committer | eris <femmediscord@gmail.com> | 2021-07-22 20:46:41 +0000 |
| commit | 179af131ee31cee6bb55554460af048556a1c5be (patch) | |
| tree | 83f2cbe1f58e6b04754e5b0ebebf069b3a0bfe37 /src/modules/config.js | |
| parent | 6125dc885ab834762989c77d8bf7be7f6b6e1b40 (diff) | |
| parent | 425919a0d292b79869ebefd2a4d52ed4db45d319 (diff) | |
Fix changelog merge conflict
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'src/modules/config.js')
| -rw-r--r-- | src/modules/config.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/config.js b/src/modules/config.js index b4b993f1..bc3db11b 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -95,7 +95,8 @@ const config = { const { defaultConfig } = rootGetters return { ...defaultConfig, - ...state + // Do not override with undefined + ...Object.fromEntries(Object.entries(state).filter(([k, v]) => v !== undefined)) } } }, |