From 13b0f4257045510549295470e030b6e61ab1ad02 Mon Sep 17 00:00:00 2001
From: Lauri Nevala <lauri.nevala@gmail.com>
Date: Mon, 26 Oct 2020 10:01:14 +0200
Subject: [PATCH] Fix merge conflict

Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>
---
 src/main/cluster.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/cluster.ts b/src/main/cluster.ts
index bc132cabf8..11964ba319 100644
--- a/src/main/cluster.ts
+++ b/src/main/cluster.ts
@@ -75,10 +75,6 @@ export class Cluster implements ClusterModel {
   @observable eventCount = 0;
   @observable preferences: ClusterPreferences = {};
   @observable metadata: ClusterMetadata = {};
-<<<<<<< HEAD
-  @observable features: FeatureStatusMap = {};
-=======
->>>>>>> extensions-api
   @observable allowedNamespaces: string[] = [];
   @observable allowedResources: string[] = [];