From e2e2d51522106411f4487ba9ac5552dea83c979d Mon Sep 17 00:00:00 2001
From: Kacper Roemer <kacperroemer@gmail.com>
Date: Mon, 30 Oct 2023 16:01:56 +0000
Subject: [PATCH] fix merge error

---
 src/index.tsx | 2 +-
 yarn.lock     | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/index.tsx b/src/index.tsx
index 16c85e796..2b7e80c48 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -46,7 +46,7 @@ function domElementGetter(): HTMLElement {
 const reactLifecycles = singleSpaReact({
   React,
   ReactDOMClient,
-  rootComponent: () => document.getElementById(pluginName) ? <App /> : null,
+  rootComponent: () => (document.getElementById(pluginName) ? <App /> : null),
   domElementGetter,
   errorBoundary: (error) => {
     log.error(`${pluginName} failed with error: ${error}`);
diff --git a/yarn.lock b/yarn.lock
index 29aff410d..63ba5ab67 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3916,15 +3916,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-table@npm:7.7.12":
-  version: 7.7.12
-  resolution: "@types/react-table@npm:7.7.12"
-  dependencies:
-    "@types/react": "*"
-  checksum: 287ea68e75b56c2e70e6d6491cd172348c7302b032789047eb2dca1b25b240684e48a60f58140575828b790f95724b9f3ec4d3adce82fc1c05d994def1449009
-  languageName: node
-  linkType: hard
-
 "@types/react-transition-group@npm:^4.4.5, @types/react-transition-group@npm:^4.4.6":
   version: 4.4.6
   resolution: "@types/react-transition-group@npm:4.4.6"