From 75b4785f5c2e2040c68b8456828743f842e1682c Mon Sep 17 00:00:00 2001 From: Schnitzel Date: Wed, 9 Apr 2025 22:38:36 +0200 Subject: [PATCH] frontend resolve conflicts --- frontend/src/components/MenuBar.vue | 80 +++++++++++++++++++++++++++++ frontend/src/views/LoginView.vue | 1 - 2 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 frontend/src/components/MenuBar.vue diff --git a/frontend/src/components/MenuBar.vue b/frontend/src/components/MenuBar.vue new file mode 100644 index 0000000..935c6c8 --- /dev/null +++ b/frontend/src/components/MenuBar.vue @@ -0,0 +1,80 @@ + + + diff --git a/frontend/src/views/LoginView.vue b/frontend/src/views/LoginView.vue index dfb1020..77466ef 100644 --- a/frontend/src/views/LoginView.vue +++ b/frontend/src/views/LoginView.vue @@ -59,7 +59,6 @@ }; -