From 16ca1a34822cd6867833b5a0e710e68a7f2be6f3 Mon Sep 17 00:00:00 2001 From: philipp Date: Tue, 5 Sep 2023 13:21:18 +0200 Subject: [PATCH] don't be too funny --- frontend/main.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/frontend/main.ts b/frontend/main.ts index 35eb9de..95adeee 100644 --- a/frontend/main.ts +++ b/frontend/main.ts @@ -223,10 +223,6 @@ function initTripSidebar(triggerElement: HTMLElement) { function replaceStrings() { const weekdays = document.querySelectorAll('.weekday-js'); Array.prototype.forEach.call(weekdays, (weekday: HTMLElement) => { -<<<<<<< HEAD -======= - //weekday.innerHTML = weekday.innerHTML.replace('Donnerstag', 'Dönerstag'); ->>>>>>> 8797bfd ([TASK] replace Freitag with Markttag for phipsi) weekday.innerHTML = weekday.innerHTML.replace('Freitag', 'Markttag'); }); }