hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix merge conflict

Browse Source 
Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>
This commit is contained in:
Lauri Nevala 2020-10-26 10:01:14 +02:00
parent 835625ee97
commit 13b0f42570
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/cluster.ts
View File

@ -75,10 +75,6 @@ export class Cluster implements ClusterModel {
@observable eventCount = 0; @observable eventCount = 0;
@observable preferences: ClusterPreferences = {}; @observable preferences: ClusterPreferences = {};
@observable metadata: ClusterMetadata = {}; @observable metadata: ClusterMetadata = {};
<<<<<<< HEAD
@observable features: FeatureStatusMap = {};
=======
>>>>>>> extensions-api
@observable allowedNamespaces: string[] = []; @observable allowedNamespaces: string[] = [];
@observable allowedResources: string[] = []; @observable allowedResources: string[] = [];