MeowcaTheoRange/Clock
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge error

Browse source
This commit is contained in:
MeowcaTheoRange 2022-09-15 10:27:13 -05:00
parent 073fe8d92a
commit 3334bc7ee4
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
update.js
View file

@ -17,11 +17,7 @@ function reqData() {
if (prevSha == "ThisShouldntBeASHA") { if (prevSha == "ThisShouldntBeASHA") {
localStorage.setItem("commitsha", resp); localStorage.setItem("commitsha", resp);
} else { } else {
<<<<<<< HEAD
document.querySelector("#updatedialog").classList.add("open"); document.querySelector("#updatedialog").classList.add("open");
=======
document.querySelector(".scr-update--").classList.add("open");
>>>>>>> 95b1e7e587ca410500cd9bcb6658d96b1c4e993b
localStorage.setItem("commitsha", resp); localStorage.setItem("commitsha", resp);
} }
} }