From c4725ba8f27e681527539b1090bfeabd6b99e9d8 Mon Sep 17 00:00:00 2001
From: "davidzagi93@gmail.com" <davidzagi93@gmail.com>
Date: Fri, 20 Aug 2021 14:20:47 +0100
Subject: [PATCH] resolve conflict by removing tsconfig.base.json in nx.json
 file

---
 nx.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nx.json b/nx.json
index a5f9bad329..84d452bf89 100644
--- a/nx.json
+++ b/nx.json
@@ -6,7 +6,7 @@
       "dependencies": "*",
       "devDependencies": "*"
     },
-    "tsconfig.base.json": "*",
+    "tsconfig.json": "*",
     "tslint.json": "*",
     ".eslintrc": "*",
     "nx.json": "*"