1
0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00

fix bad merge conflict resolve

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Jari Kolehmainen 2022-12-21 12:31:48 +02:00
parent 7d8286c837
commit 1057fa47d9

View File

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