From 3334bc7ee41c0f79964d11937f478cb3cdc5ecb6 Mon Sep 17 00:00:00 2001
From: MeowcaTheoRange <tabletmeowcat@gmail.com>
Date: Thu, 15 Sep 2022 10:27:13 -0500
Subject: [PATCH] merge error

---
 update.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/update.js b/update.js
index 173aa44..a417a1c 100644
--- a/update.js
+++ b/update.js
@@ -17,11 +17,7 @@ function reqData() {
       if (prevSha == "ThisShouldntBeASHA") {
         localStorage.setItem("commitsha", resp);
       } else {
-<<<<<<< HEAD
         document.querySelector("#updatedialog").classList.add("open");
-=======
-        document.querySelector(".scr-update--").classList.add("open");
->>>>>>> 95b1e7e587ca410500cd9bcb6658d96b1c4e993b
         localStorage.setItem("commitsha", resp);
       }
     }