diff options
| author | eris <femmediscord@gmail.com> | 2021-07-22 20:47:36 +0000 |
|---|---|---|
| committer | eris <femmediscord@gmail.com> | 2021-07-22 20:47:36 +0000 |
| commit | f35e3d0f3fc1a6bb4ebd77fba1dce0ac27f5b7d7 (patch) | |
| tree | b051403a1d8afb16d4f82dbc879c0f3187266ddd /src/modules/config.js | |
| parent | 139a0d15620763329499265d505ae8f030e2ed69 (diff) | |
| parent | 425919a0d292b79869ebefd2a4d52ed4db45d319 (diff) | |
Fix merge conflict in CHANGELOG
# 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 bdab3f4d..33e2cb50 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -94,7 +94,8 @@ const config = { const { defaultConfig } = rootGetters return { ...defaultConfig, - ...state + // Do not override with undefined + ...Object.fromEntries(Object.entries(state).filter(([k, v]) => v !== undefined)) } } }, |