From 6cb5e7bba8cf2e0c09c444be3d8be19d7c30df72 Mon Sep 17 00:00:00 2001
From: Dave Mc Nicoll <dave.mcnicoll@cslsj.qc.ca>
Date: Mon, 1 Jun 2026 15:16:11 +0000
Subject: [PATCH] - Rebased

---
 src/ApplicationStrategy.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/ApplicationStrategy.php b/src/ApplicationStrategy.php
index 30fb7d3..0b182f4 100644
--- a/src/ApplicationStrategy.php
+++ b/src/ApplicationStrategy.php
@@ -33,12 +33,11 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
     {
         return $this->getContainer()->get(ThrowableHandlerInterface::class);
     }
-
+    
     public function getMethodNotAllowedDecorator(MethodNotAllowedException $exception): MiddlewareInterface
     {
         return $this->getContainer()->has(MethodNotAllowedInterface::class) ? $this->getContainer()->get(MethodNotAllowedInterface::class) : parent::getMethodNotAllowedDecorator($exception);
     }
-<<<<<<< HEAD
 
 /*<<<<<<< HEAD
         /*=======
@@ -68,10 +67,8 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
                 return $this->di->get('error.404');
             }
         };
-<<<<<<< HEAD
+<<<<<<< HEAD 
     }
 
 >>>>>>> af8b686 (- WIP on ulmus-user mechanics updates)*/
-=======
->>>>>>> 06c4f46 (- Added MethodNotAllowed interface)
 }
\ No newline at end of file