diff options
| author | David Mehren | 2021-02-12 22:53:05 +0100 |
|---|---|---|
| committer | GitHub | 2021-02-12 22:53:05 +0100 |
| commit | fbac2d7ef8be325635da78e0b762cfb813c1fca2 (patch) | |
| tree | e8440c525d2caf6f42cf33e3e5581c86526928b9 /webpack.prod.js | |
| parent | 6cbf233fe76698462121f2f17c9231421b9673dc (diff) | |
| parent | 87909b599e08a2361173c3a8717927da51e1aec3 (diff) | |
Merge pull request #895 from hedgedoc/renovate/master-webpack-merge-5.x
Diffstat (limited to 'webpack.prod.js')
| -rw-r--r-- | webpack.prod.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webpack.prod.js b/webpack.prod.js index 4dfac1a8..5c523c06 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -1,6 +1,6 @@ const common = require('./webpack.common.js') const htmlexport = require('./webpack.htmlexport') -const merge = require('webpack-merge') +const { merge } = require('webpack-merge'); const path = require('path') const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin') |