fhaujoifa

2024-12-12 17:04:34 +01:00 · 2024-12-12 17:04:34 +01:00 · af50b4bd60
commit af50b4bd60
parent 53b56f986f
1 changed files with 0 additions and 4 deletions
--- a/src/Controller/AuthenticationController.php
+++ b/src/Controller/AuthenticationController.php
@ -18,11 +18,7 @@ class AuthenticationController extends AbstractController
        // last username entered by the user
        $lastUsername = $authenticationUtils->getLastUsername();

-<<<<<<< HEAD
-        return $this->render('calendrier/index.html.twig', [
-=======
        return $this->render('login/index.html.twig', [
->>>>>>> 05b64fc2b1e17491a87ea32353e6987b0e97bf50
            'last_username' => $lastUsername,
            'error' => $error,
        ]);