From 5f5f7e0fd27f442883d3cbe2384ccb147275a6f3 Mon Sep 17 00:00:00 2001 From: Guuq <50501321+Guuq@users.noreply.github.com> Date: Tue, 29 Oct 2019 16:26:31 +0100 Subject: [PATCH] 29-10-2019 #1 --- 404.md => 404/404.md | 0 resources/javall.js | 8 -------- 2 files changed, 8 deletions(-) rename 404.md => 404/404.md (100%) diff --git a/404.md b/404/404.md similarity index 100% rename from 404.md rename to 404/404.md diff --git a/resources/javall.js b/resources/javall.js index 2c94ca4..ddf25c5 100644 --- a/resources/javall.js +++ b/resources/javall.js @@ -5,11 +5,3 @@ console.log('%cDoor Guus van Meerveld', "color:#9c9c9c; font-size:30px;"); var shortcon = $("", {rel :'shortcut icon',href:'/resources/img/favicon.ico'}) $('head').append(shortcon) -<<<<<<< HEAD - -// Https -if (location.protocol == "http:" && location.port !== "3000" && location.host !== "guusvanmeerveld.online") { - location.protocol = "https:" -} -======= ->>>>>>> e28a9453f062af65383d1324fd83a161d4d22222