From 2eba814fe7dae5f554d76e744edfe7e3fb99aa2d Mon Sep 17 00:00:00 2001
From: Lauri Nevala <lauri.nevala@gmail.com>
Date: Tue, 18 Jan 2022 10:47:26 +0200
Subject: [PATCH] Fix conflict resolve

Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>
---
 .../components/+extensions/installed-extensions.tsx         | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/renderer/components/+extensions/installed-extensions.tsx b/src/renderer/components/+extensions/installed-extensions.tsx
index cfad07ed37..c948e05eac 100644
--- a/src/renderer/components/+extensions/installed-extensions.tsx
+++ b/src/renderer/components/+extensions/installed-extensions.tsx
@@ -62,11 +62,7 @@ function getStatus(extension: InstalledExtension) {
   return extension.isEnabled ? "Enabled" : "Disabled";
 }
 
-<<<<<<< HEAD
-export const InstalledExtensions = observer(({ extensions, uninstall, enable, disable, upgrade }: Props) => {
-=======
-const NonInjectedInstalledExtensions : React.FC<Dependencies & Props> = (({ extensionDiscovery, extensionInstallationStateStore, extensions, uninstall, enable, disable }) => {
->>>>>>> master
+const NonInjectedInstalledExtensions : React.FC<Dependencies & Props> = (({ extensionDiscovery, extensionInstallationStateStore, extensions, uninstall, enable, disable, upgrade }) => {
   const filters = [
     (extension: InstalledExtension) => extension.manifest.name,
     (extension: InstalledExtension) => getStatus(extension),