diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-11-07 18:19:34 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-11-07 18:23:02 +0100 |
| commit | 412218af2ecd4cd004708d781e574208742dea4c (patch) | |
| tree | c0bf823109c7481ec9242a0263e091ec4aaeafeb /config/webpack/tests.js | |
| parent | 5a9fc749c3eab8d3c93dd282fa89c20a5cb0e994 (diff) | |
| parent | ee8cf246cfe8e05914ad7dcf81596f8535b3e161 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'config/webpack/tests.js')
| -rw-r--r-- | config/webpack/tests.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/webpack/tests.js b/config/webpack/tests.js index 8b56eb92f..f9d39f1b8 100644 --- a/config/webpack/tests.js +++ b/config/webpack/tests.js @@ -1,6 +1,6 @@ // Note: You must restart bin/webpack-dev-server for changes to take effect -const merge = require('webpack-merge'); +const { merge } = require('webpack-merge'); const sharedConfig = require('./shared.js'); module.exports = merge(sharedConfig, { |