From 1057fa47d99688a164ea953a1f2ce75c88226432 Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Wed, 21 Dec 2022 12:31:48 +0200
Subject: [PATCH] fix bad merge conflict resolve

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 package.json | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/package.json b/package.json
index c9b037d6a8..125e8b3290 100644
--- a/package.json
+++ b/package.json
@@ -4,9 +4,6 @@
   "description": "OpenLens - Open Source IDE for Kubernetes",
   "homepage": "https://github.com/lensapp/lens",
   "version": "6.3.0-alpha.0",
-  "directories": {
-    "doc": "docs"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lensapp/lens.git"
@@ -97,12 +94,7 @@
     "bundledHelmVersion": "3.7.2",
     "sentryDsn": "",
     "contentSecurityPolicy": "script-src 'unsafe-eval' 'self'; frame-src http://*.localhost:*/; img-src * data:",
-<<<<<<< HEAD
     "welcomeRoute": "/welcome"
-=======
-    "welcomeRoute": "/welcome",
-    "extensions": []
->>>>>>> master
   },
   "engines": {
     "node": ">=16 <17"