From d481ac7935f4ab83d83e26998d2f86f929a37863 Mon Sep 17 00:00:00 2001
From: compscifag <a-manga-thing@protonmail.com>
Date: Fri, 28 May 2021 11:33:56 +0300
Subject: [PATCH] fixed git garbage

---
 search.html | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/search.html b/search.html
index 152bb03..3edf950 100644
--- a/search.html
+++ b/search.html
@@ -75,18 +75,11 @@
     <script>
         document.onreadystatechange = function () {
 		if(document.readyState == "interactive") {
-<<<<<<< HEAD
 		    var addr = decodeURIComponent(document.cookie).split(";")[0].split("=")[1];
 		    console.log("loading from "+addr);
 		    load_titles("https://"+addr+"/manga/search"+window.location.search);
 		    document.querySelector("#title_list").style.visibility = "visible";
 		    document.querySelector("#label").textContent = "Result";
-=======
-			console.log("on load");
-			load_titles("https://amangathing.ddns.net/instance/manga/search"+window.location.search);
-			document.querySelector("#title_list").style.visibility = "visible";
-			document.querySelector("#label").textContent = "Result";
->>>>>>> b91c43f186414c87cd93ead9d8111707b3ac9565
 		}
         }
     </script>