fix: webpack.common.mjs 수정

woowacourse-teams · Aug 8, 2024 · 326f45e · 326f45e
1 parent 6b5753c
commit 326f45e
Showing 1 changed file with 0 additions and 19 deletions.
diff --git a/client/webpack.common.mjs b/client/webpack.common.mjs
@@ -22,14 +22,6 @@ export default {
       '@utils': path.resolve(__dirname, 'src/utils/'),
     },
   },
-<<<<<<< HEAD:client/webpack.common.mjs
-=======
-  output: {
-    path: path.join(__dirname, 'dist'),
-    filename: '[name].[hash].js',
-    publicPath: '/',
-  },
->>>>>>> fe-dev:client/webpack.config.js
   module: {
     rules: [
       {
@@ -61,15 +53,4 @@ export default {
       ],
     }),
   ],
-<<<<<<< HEAD:client/webpack.common.mjs
-=======
-  devServer: {
-    port: 3000,
-    hot: true,
-    historyApiFallback: true,
-    client: {
-      overlay: false,
-    },
-  },
->>>>>>> fe-dev:client/webpack.config.js
 };