some fuckery to get dev branch working

404.html

@@ -32,11 +32,6 @@
 
     <!-- toastify -->
     <script>
-<<<<<<< HEAD
-      if(document.href.contains("eg1.8") || document.href.contains("eaglercraft")) {
-        document.href = "/semag/eg/"
-      }
-=======
       document.addEventListener("DOMContentLoaded", () => {
         
       })
@@ -47,7 +42,6 @@
           }
         }
       })
->>>>>>> c2041b6 (first dev commit)
     </script>
   </head>
   <alerts>
@@ -70,10 +64,6 @@
       <p>Trying to access a page such as login, register, or a user page? Those are only available on official links.</p>
       <p><a href="https://discord.gg/7jyufnwJNf">Join the Discord to find official links.</a></p>
       <a href="/index.html"><button>Go home</button></a>
-<<<<<<< HEAD
-    </div>
-
-=======
       <button onclick="statsForNerds()">Stats for nerds</button>
           <div id="sfn" style="display: none;" class="message">
       Please report this to our <a href="https://discord.gg/7jyufnwJNf">Discord</a> or <a href="mailto:support@selenite.cc">email.</a> <br> 
@@ -96,7 +86,6 @@
 "innerText"in document.body||Object.defineProperty(HTMLElement.prototype,"innerText",{get:function(){return this.textContent},set:function(a){this.textContent=a}}),window.fetch||(window.fetch=function(a){return new Promise(function(b,c){var d=new XMLHttpRequest;d.open("GET",a),d.onload=function(){200===d.status?b(JSON.parse(d.responseText)):c(Error(d.statusText))},d.onerror=function(){c(Error("Network Error"))},d.send()})}),window.XMLHttpRequest||(window.XMLHttpRequest=function(){try{return new ActiveXObject("Msxml2.XMLHTTP.6.0")}catch(a){}try{return new ActiveXObject("Msxml2.XMLHTTP.3.0")}catch(a){}try{return new ActiveXObject("Msxml2.XMLHTTP")}catch(a){}throw new Error("This browser does not support XMLHttpRequest.")});function statsForNerds(){var a=document.getElementById("sfn");"none"===a.style.display?(a.style.display="block",console.log("[\u2139\uFE0F] Showing the stats for nerds!")):(a.style.display="none",console.log("[\u2139\uFE0F] Hiding the stats for nerds!"))}document.getElementById("full").innerText=window.location.href,document.getElementById("ref").innerHTML=document.referrer,document.getElementById("title").innerText=document.title,document.getElementById("height").innerHTML=screen.height+"px",document.getElementById("width").innerHTML=screen.width+"px",document.getElementById("winheight").innerHTML=window.innerHeight+"px",document.getElementById("winwidth").innerHTML=window.innerWidth+"px",document.getElementById("cookie").innerText=navigator.cookieEnabled,document.getElementById("ua").innerHTML=navigator.userAgent,document.getElementById("plat").innerHTML=navigator.platform,document.getElementById("online").innerHTML=navigator.onLine;var echolog={};fetch("//wtfismyip.com/json").then(function(a){return a.json()}).then(function(a){var b={ipAddress:a.YourFuckingIPAddress,hostname:a.YourFuckingHostname},c=document.getElementById("ip");c.innerText=b.ipAddress})["catch"](function(a){return console.error(a)});
     </script>
 
->>>>>>> c2041b6 (first dev commit)
     </main>
     
     <footer class="noscroll">