noxious/client
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge conflict fix

Browse Source
This commit is contained in:
Colin Kallemein 2024-11-03 22:00:29 +01:00
parent 67b6339ffc
commit f203bf9534
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/screens/Login.vue
View File

@ -29,9 +29,9 @@
import { onMounted, ref } from 'vue' import { onMounted, ref } from 'vue'
import { useGameStore } from '@/stores/gameStore' import { useGameStore } from '@/stores/gameStore'
import { useCookies } from '@vueuse/integrations/useCookies' import { useCookies } from '@vueuse/integrations/useCookies'
import LoginForm from '@/components/screens/partials/LoginForm.vue' import LoginForm from '@/components/screens/partials/login/LoginForm.vue'
import RegisterForm from '@/components/screens/partials/RegisterForm.vue' import RegisterForm from '@/components/screens/partials/login/RegisterForm.vue'
import NewPasswordForm from '@/components/screens/partials/NewPasswordForm.vue' import NewPasswordForm from '@/components/screens/partials/login/NewPasswordForm.vue'
import ResetPassword from '@/components/utilities/ResetPassword.vue' import ResetPassword from '@/components/utilities/ResetPassword.vue'
const isPasswordResetFormShown = ref(false) const isPasswordResetFormShown = ref(false)