From c7e147d037dbfc274f7d6de111d98fd647ccd2bf Mon Sep 17 00:00:00 2001
From: vios-fish <vios.fish@gmail.com>
Date: Tue, 2 Feb 2021 22:40:40 +0900
Subject: [PATCH] fix: update webpack.config.js

---
 front/webpack.dev.js  | 2 +-
 front/webpack.prod.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/front/webpack.dev.js b/front/webpack.dev.js
index 9b5014af..a5b3a70f 100644
--- a/front/webpack.dev.js
+++ b/front/webpack.dev.js
@@ -1,5 +1,5 @@
 const webpack = require('webpack');
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const common = require('./webpack.common.js');
 const path = require('path');
 const BundleTracker = require('webpack-bundle-tracker');
diff --git a/front/webpack.prod.js b/front/webpack.prod.js
index 15fe5936..1584fd4f 100644
--- a/front/webpack.prod.js
+++ b/front/webpack.prod.js
@@ -1,5 +1,5 @@
 const webpack = require('webpack');
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const common = require('./webpack.common.js');
 const path = require('path');
 const BundleTracker = require('webpack-bundle-tracker');