From e5627edb784b55b1e6a421604f8af80b449d480a Mon Sep 17 00:00:00 2001
From: Mario Sarcher <msarcher@mirantis.com>
Date: Thu, 5 Nov 2020 15:25:31 +0100
Subject: [PATCH] Fix merge conflict in menu

---
 src/main/menu.ts | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/main/menu.ts b/src/main/menu.ts
index 2e2357e01b..cb8f260dcf 100644
--- a/src/main/menu.ts
+++ b/src/main/menu.ts
@@ -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 { WindowManager } from "./window-manager";
 import { appName, isMac, isWindows } from "../common/vars";
@@ -193,21 +193,12 @@ export function buildMenu(windowManager: WindowManager) {
           navigate(whatsNewURL())
         },
       },
-<<<<<<< HEAD
       {
         label: "Documentation",
         click: async () => {
           shell.openExternal('https://docs.k8slens.dev/');
         },
       },
-      {
-        label: "License",
-        click: async () => {
-          shell.openExternal('https://k8slens.dev/licenses/eula.md');
-        },
-      },
-=======
->>>>>>> master
       ...ignoreOnMac([
         {
           label: "About Lens",