29-10-2019 #1

5 years ago · 5f5f7e0fd2
parent 926499005a
commit 5f5f7e0fd2
2 changed files with 0 additions and 8 deletions
--- a/404/404.md
+++ b/404/404.md
--- 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 = $("<link>", {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