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 in menu

Browse Source
This commit is contained in:
Mario Sarcher 2020-11-05 15:25:31 +01:00
parent d5486bec11
commit e5627edb78
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/menu.ts
View File

@ -1,4 +1,4 @@
import { app, BrowserWindow, dialog, Menu, MenuItem, MenuItemConstructorOptions, webContents } from "electron" import { app, BrowserWindow, dialog, Menu, MenuItem, MenuItemConstructorOptions, webContents, shell } from "electron"
import { autorun } from "mobx"; import { autorun } from "mobx";
import { WindowManager } from "./window-manager"; import { WindowManager } from "./window-manager";
import { appName, isMac, isWindows } from "../common/vars"; import { appName, isMac, isWindows } from "../common/vars";
@ -193,21 +193,12 @@ export function buildMenu(windowManager: WindowManager) {
navigate(whatsNewURL()) navigate(whatsNewURL())
}, },
}, },
<<<<<<< HEAD
{ {
label: "Documentation", label: "Documentation",
click: async () => { click: async () => {
shell.openExternal('https://docs.k8slens.dev/'); shell.openExternal('https://docs.k8slens.dev/');
}, },
}, },
{
label: "License",
click: async () => {
shell.openExternal('https://k8slens.dev/licenses/eula.md');
},
},
=======
>>>>>>> master
...ignoreOnMac([ ...ignoreOnMac([
{ {
label: "About Lens", label: "About Lens",