Merge conflict

This commit is contained in:
n1474335 2017-05-02 23:03:28 +01:00
commit 80cdf0c014
76 changed files with 1504 additions and 809 deletions

View file

@ -23,8 +23,8 @@ import OperationConfig from "../core/config/OperationConfig.js";
/**
* Main function used to build the CyberChef web app.
*/
var main = function() {
var defaultFavourites = [
function main() {
const defaultFavourites = [
"To Base64",
"From Base64",
"To Hex",
@ -37,7 +37,7 @@ var main = function() {
"Fork"
];
var defaultOptions = {
const defaultOptions = {
updateUrl : true,
showHighlighter : true,
treatAsUtf8 : true,
@ -52,7 +52,7 @@ var main = function() {
document.removeEventListener("DOMContentLoaded", main, false);
window.app = new App(Categories, OperationConfig, defaultFavourites, defaultOptions);
window.app.setup();
};
}
// Fix issues with browsers that don't support console.log()
window.console = console || {log: function() {}, error: function() {}};