remove committed conflict markers

console/src/main.js

@@ -255,8 +255,8 @@ function goHomeClicked() {
 var logWindow = null;
 
 function buildMenuArray(serverState) {
-<<<<<<< HEAD
     var menuArray = null;
+    
     if (isShuttingDown) {
         menuArray = [
             {
@@ -266,54 +266,6 @@ function buildMenuArray(serverState) {
         ];
     } else {
         menuArray = [
-            {
-                label: 'Go Home',
-                click: goHomeClicked,
-                enabled: false
-            },
-            {
-                type: 'separator'
-            },
-            {
-                label: "Server - Stopped",
-                enabled: false
-            },
-            {
-                label: "Start",
-                click: function() { homeServer.restart(); }
-            },
-            {
-                label: "Stop",
-                visible: false,
-                click: function() { homeServer.stop(); }
-            },
-            {
-                label: "Settings",
-                click: function() { shell.openExternal('http://localhost:40100/settings'); },
-                enabled: false
-            },
-            {
-                label: "View Logs",
-                click: function() { logWindow.open(); }
-            },
-            {
-                label: "Open Log Directory",
-                click: function() { openFileBrowser(logPath); }
-            },
-            {
-                type: 'separator'
-            },
-            {
-                label: 'Quit',
-                accelerator: 'Command+Q',
-                click: function() { shutdown(); }
-            }
-        ];
-
-        updateMenuArray(menuArray, serverState);
-    }
-=======
-    var menuArray = [
             {
                 label: 'Server - Stopped',
                 enabled: false
@@ -363,8 +315,9 @@ function buildMenuArray(serverState) {
                 click: function() { app.quit(); }
             }
         ];
->>>>>>> shuffling and renaming of menu options
 
+        updateMenuArray(menuArray, serverState);
+    }
 
     return menuArray;
 }