fhaujoifa

This commit is contained in:
ragueneaul 2024-12-12 17:04:34 +01:00
parent 53b56f986f
commit af50b4bd60

View File

@ -18,11 +18,7 @@ class AuthenticationController extends AbstractController
// last username entered by the user // last username entered by the user
$lastUsername = $authenticationUtils->getLastUsername(); $lastUsername = $authenticationUtils->getLastUsername();
<<<<<<< HEAD
return $this->render('calendrier/index.html.twig', [
=======
return $this->render('login/index.html.twig', [ return $this->render('login/index.html.twig', [
>>>>>>> 05b64fc2b1e17491a87ea32353e6987b0e97bf50
'last_username' => $lastUsername, 'last_username' => $lastUsername,
'error' => $error, 'error' => $error,
]); ]);