diff options
| author | Takeshi Umeda <noel.yoshiba@gmail.com> | 2021-01-10 11:17:55 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-10 11:17:55 +0900 |
| commit | 98a2603dc163210d3a0aab0a0c2b8ef74c7e5eb0 (patch) | |
| tree | 761694d2d697c58faf02a3ff9ef26bf045fc0274 /config/webpack/production.js | |
| parent | 7cd4ed7d4298626d2b141cd6d8378e95bc248824 (diff) | |
| parent | 087ed84367537ac168ed3e00bb7eb4bd582dc3d0 (diff) | |
| download | mastodon-feature-limited-visibility-bearcaps.tar mastodon-feature-limited-visibility-bearcaps.tar.gz mastodon-feature-limited-visibility-bearcaps.tar.bz2 mastodon-feature-limited-visibility-bearcaps.zip | |
Merge branch 'master' into feature-limited-visibility-bearcapsfeature-limited-visibility-bearcaps
Diffstat (limited to 'config/webpack/production.js')
| -rw-r--r-- | config/webpack/production.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/webpack/production.js b/config/webpack/production.js index f2f216422..f1d0dabae 100644 --- a/config/webpack/production.js +++ b/config/webpack/production.js @@ -2,7 +2,7 @@ const path = require('path'); const { URL } = require('url'); -const merge = require('webpack-merge'); +const { merge } = require('webpack-merge'); const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer'); const OfflinePlugin = require('offline-plugin'); const TerserPlugin = require('terser-webpack-plugin'); |