diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-09-08 13:24:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-08 13:24:54 +0200 |
| commit | 127aaa81742d57a7cee782c7d7fa3ec83488fba5 (patch) | |
| tree | 2cf834a3719e8ab485d57d3f448df887bdc2bdae /config | |
| parent | e7e04b46d750f5e2addfd9650991727101d76910 (diff) | |
| parent | f9185c72a9aeaaa09eec6186776108dafa27d3fd (diff) | |
Merge pull request #1594 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config')
| -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 f9d39f1b8..84f008eac 100644 --- a/config/webpack/tests.js +++ b/config/webpack/tests.js @@ -1,7 +1,7 @@ // Note: You must restart bin/webpack-dev-server for changes to take effect const { merge } = require('webpack-merge'); -const sharedConfig = require('./shared.js'); +const sharedConfig = require('./shared'); module.exports = merge(sharedConfig, { mode: 'development', |