From 373431f0d00859e6856697f0c7df4c3f93f203ae Mon Sep 17 00:00:00 2001 From: Schnitzel Date: Wed, 9 Apr 2025 22:41:54 +0200 Subject: [PATCH] frontend resolve conflicts --- frontend/src/views/LoginView.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frontend/src/views/LoginView.vue b/frontend/src/views/LoginView.vue index 77466ef..304e082 100644 --- a/frontend/src/views/LoginView.vue +++ b/frontend/src/views/LoginView.vue @@ -16,8 +16,6 @@