From 9ef31a575ad1cb5bdd2fe8d34de4f6173038845c Mon Sep 17 00:00:00 2001 From: "davidzagi93@gmail.com" Date: Fri, 27 Aug 2021 00:16:51 +0100 Subject: [PATCH] resolving conflicts after pulling master --- tsconfig.base.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsconfig.base.json b/tsconfig.base.json index 582621cb22..788dd383f1 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -42,7 +42,7 @@ "@remix-ui/solidity-compiler": ["libs/remix-ui/solidity-compiler/src/index.ts"], "@remix-ui/publish-to-storage": ["libs/remix-ui/publish-to-storage/src/index.ts"], "@remix-ui/renderer": ["libs/remix-ui/renderer/src/index.ts"], - "@remix-ui/terminal": ["libs/remix-ui/terminal/src/index.ts"] + "@remix-ui/terminal": ["libs/remix-ui/terminal/src/index.ts"], "@remix-ui/plugin-manager": ["libs/remix-ui/plugin-manager/src/index.ts"], } },