From f203bf953471ac449849c663a7ab2699fa5edc46 Mon Sep 17 00:00:00 2001 From: Colin Kallemein Date: Sun, 3 Nov 2024 22:00:29 +0100 Subject: [PATCH] Merge conflict fix --- src/components/screens/Login.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/screens/Login.vue b/src/components/screens/Login.vue index 4e2313d..b87b176 100644 --- a/src/components/screens/Login.vue +++ b/src/components/screens/Login.vue @@ -29,9 +29,9 @@ import { onMounted, ref } from 'vue' import { useGameStore } from '@/stores/gameStore' import { useCookies } from '@vueuse/integrations/useCookies' -import LoginForm from '@/components/screens/partials/LoginForm.vue' -import RegisterForm from '@/components/screens/partials/RegisterForm.vue' -import NewPasswordForm from '@/components/screens/partials/NewPasswordForm.vue' +import LoginForm from '@/components/screens/partials/login/LoginForm.vue' +import RegisterForm from '@/components/screens/partials/login/RegisterForm.vue' +import NewPasswordForm from '@/components/screens/partials/login/NewPasswordForm.vue' import ResetPassword from '@/components/utilities/ResetPassword.vue' const isPasswordResetFormShown = ref(false)