From cad38bbf6ac9ce557acd3ce4c649ec94bb81bb96 Mon Sep 17 00:00:00 2001
From: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date: Mon, 15 Aug 2022 20:15:36 -0700
Subject: [PATCH] Chores: fix compilation

---
 packages/webapp/webpack.common.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/webapp/webpack.common.js b/packages/webapp/webpack.common.js
index f182dcca..e8e66143 100644
--- a/packages/webapp/webpack.common.js
+++ b/packages/webapp/webpack.common.js
@@ -38,10 +38,7 @@ module.exports = {
   },
   optimization: {
     usedExports: true,
-<<<<<<< HEAD
-=======
     chunkIds: 'named',
->>>>>>> feature/lazy_load
     splitChunks: {
       cacheGroups: {
         vendors: {