From b06d9be4931f0e7dc5fcf8cafb040c48337b752a Mon Sep 17 00:00:00 2001
From: andreiggr <andrei.ggr@gmail.com>
Date: Mon, 4 Sep 2023 16:57:01 +0300
Subject: [PATCH] fix: clear jsconfig

---
 jsconfig.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/jsconfig.json b/jsconfig.json
index 5ebfcfd..adec339 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -1,12 +1,9 @@
 {
     "compilerOptions": {
         "paths": {
-<<<<<<< Updated upstream
-=======
             "@eeacms/volto-elastic-csv-widget": [
                 "addons/volto-elastic-csv-widget/src"
             ],
->>>>>>> Stashed changes
             "@eeacms/volto-marine-theme": [
                 "addons/volto-marine-theme/src"
             ]