From 7c6630e444b051ee5912798ff10d3b37c509ccc0 Mon Sep 17 00:00:00 2001 From: itsrubberduck Date: Fri, 19 Sep 2025 23:00:25 +0200 Subject: [PATCH] merge conflig --- app/pages/index.vue | 878 +++++++++++++++++++++++++++----------------- 1 file changed, 537 insertions(+), 341 deletions(-) diff --git a/app/pages/index.vue b/app/pages/index.vue index 308d8ed..8d806d6 100644 --- a/app/pages/index.vue +++ b/app/pages/index.vue @@ -4,7 +4,7 @@