diff options
Diffstat (limited to 'core/webpack.test.js')
| -rw-r--r-- | core/webpack.test.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/webpack.test.js b/core/webpack.test.js index 024348fe879..f87d8bd9d92 100644 --- a/core/webpack.test.js +++ b/core/webpack.test.js @@ -1,4 +1,4 @@ -/* +/** * @copyright 2018 Christoph Wurst <christoph@winzerhof-wurst.at> * * @author 2018 Christoph Wurst <christoph@winzerhof-wurst.at> @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -const merge = require('webpack-merge'); +const { merge } = require('webpack-merge'); const common = require('./webpack.js'); // webpack.config.js const nodeExternals = require('webpack-node-externals') |