From af50b4bd60c3acd607f64ec552b107f1c72ff082 Mon Sep 17 00:00:00 2001
From: ragueneaul <lucas.ragueneau@orange.fr>
Date: Thu, 12 Dec 2024 17:04:34 +0100
Subject: [PATCH] fhaujoifa

---
 src/Controller/AuthenticationController.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Controller/AuthenticationController.php b/src/Controller/AuthenticationController.php
index b19aed1..d8e6b43 100644
--- 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,
         ]);