Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-29 00:45:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove committed conflict markers

Browse source
This commit is contained in:
Stephen Birarda 2016-01-15 15:30:34 -08:00
parent 4e94817959
commit 9aeda32f3f
1 changed files with 19 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
console/src/main.js
View file

@ -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;
}