From 82f370bf5aaa64e2bec0aca4683c654cc11c88d6 Mon Sep 17 00:00:00 2001 From: Ronni Skansing Date: Thu, 23 Oct 2025 13:03:11 +0200 Subject: [PATCH] fix bad copy of mfa code and version. fix badmerge Signed-off-by: Ronni Skansing --- frontend/src/routes/dashboard/+page.svelte | 46 ---------------------- frontend/src/routes/profile/+page.svelte | 4 +- frontend/src/routes/settings/+page.svelte | 6 +-- 3 files changed, 3 insertions(+), 53 deletions(-) diff --git a/frontend/src/routes/dashboard/+page.svelte b/frontend/src/routes/dashboard/+page.svelte index c0d68aa..09cb84a 100644 --- a/frontend/src/routes/dashboard/+page.svelte +++ b/frontend/src/routes/dashboard/+page.svelte @@ -612,50 +612,4 @@ {/each} -<<<<<<< HEAD - - Recent Campaigns -
- - {#each campaignStats as stat} - - - {#if stat.campaignId} - - {stat.campaignName} - - {:else} - - {stat.campaignName} - - {/if} - - - - - - - - - - {/each} -
-
-======= ->>>>>>> fix-dashboards-setup diff --git a/frontend/src/routes/profile/+page.svelte b/frontend/src/routes/profile/+page.svelte index 7454bc1..35591a7 100644 --- a/frontend/src/routes/profile/+page.svelte +++ b/frontend/src/routes/profile/+page.svelte @@ -609,7 +609,7 @@