Merge-Konflikte gelöst: Remote-Version übernommen

This commit is contained in:
root
2025-11-05 11:40:16 +01:00
parent 1e30dac000
commit 88b6e35593
3 changed files with 242 additions and 2534 deletions

View File

@@ -14,8 +14,6 @@
</div>
<div class="TimeContainer">
<div id="clockdiv">
<div>
@@ -64,10 +62,10 @@
console.log(images);
var deadline = new Date("Dec1, 2025 00:00").getTime();
var advent1 = new Date("2025-11-30");
var advent2 = new Date("2025-12-07");
var advent3 = new Date("2025-12-14");
var advent4 = new Date("2025-12-21");
var advent1 = new Date("2024-12-01");
var advent2 = new Date("2024-12-08");
var advent3 = new Date("2024-12-15");
var advent4 = new Date("2024-12-22");
if(advent1.getTime()<=getNow().getTime()) {
$("#kerze1").show();
}

File diff suppressed because it is too large Load Diff