diff options
| author | Starfall <us@starfall.systems> | 2020-11-19 10:02:56 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-11-19 10:02:56 -0600 |
| commit | 383bb3804bdbd6caa442283cc96ef0cdbfdb4575 (patch) | |
| tree | 54ecc09c325567ab1cfc4af9ba13ad134d9c3c72 /config/webpack/tests.js | |
| parent | 259470ec37dfc5c3d34ed5456adcd3ab1a622a18 (diff) | |
| parent | db01f8b942b72eaa2eacbb144261b002f8079c9c (diff) | |
Merge branch 'glitch' into main
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, { |