From 390b8e4e31b89a7bca8cdcad9f4580efc106f31d Mon Sep 17 00:00:00 2001
From: Martin Guillon <martin.guillon@akylas.fr>
Date: Wed, 5 May 2021 10:17:58 +0200
Subject: [PATCH] chore: merge

---
 tsconfig.eslint.json | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
index 15e4af2bf..5d8f21e45 100644
--- a/tsconfig.eslint.json
+++ b/tsconfig.eslint.json
@@ -1,10 +1,4 @@
 {
-<<<<<<< HEAD
-    "extends": "./tsconfig.json",
-    "include": ["packages/**/*"]
-}
-=======
 	"extends": "./tsconfig.json",
 	"include": ["packages/**/*"]
 }
->>>>>>> 9ec404225ef0cff5f82d759fcdc7b85952e65c0d