From 538e0b9aec28e1edd64260d19dcd7bc9f99e42e8 Mon Sep 17 00:00:00 2001 From: Dave Mc Nicoll Date: Thu, 21 May 2026 15:09:20 +0000 Subject: [PATCH] - Fixed conflicts --- src/ApplicationStrategy.php | 3 ++- view/lean/picto/undraw_error.phtml | 21 +-------------------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/ApplicationStrategy.php b/src/ApplicationStrategy.php index 37599fc..d5b833d 100644 --- a/src/ApplicationStrategy.php +++ b/src/ApplicationStrategy.php @@ -33,7 +33,7 @@ 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); @@ -67,6 +67,7 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy { return $this->di->get('error.404'); } }; +<<<<<<< HEAD } >>>>>>> af8b686 (- WIP on ulmus-user mechanics updates)*/ diff --git a/view/lean/picto/undraw_error.phtml b/view/lean/picto/undraw_error.phtml index 17d7e58..6ed7924 100644 --- a/view/lean/picto/undraw_error.phtml +++ b/view/lean/picto/undraw_error.phtml @@ -1,20 +1 @@ -<<<<<<< HEAD -<<<<<<< HEAD -bug fixing -======= - ->>>>>>> e2672c4 (- Added createStream methods and fixed multiple errors views) -======= - -======= -<<<<<<< HEAD -<<<<<<< HEAD -bug fixing -======= - ->>>>>>> fdca37a (- Added createStream methods and fixed multiple errors views) -======= - ->>>>>>> fdca37a (- Added createStream methods and fixed multiple errors views) ->>>>>>> 16ee065 (- Added createStream methods and fixed multiple errors views) ->>>>>>> 1c2878a (- Added createStream methods and fixed multiple errors views) +bug fixing \ No newline at end of file