forked from noxious/client
Merge conflict fix
This commit is contained in:
parent
67b6339ffc
commit
f203bf9534
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user