- Fixed conflicts

This commit is contained in:
Dave Mc Nicoll 2026-05-21 15:09:20 +00:00
parent 7bad9a69c9
commit 538e0b9aec
2 changed files with 3 additions and 21 deletions

View File

@ -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)*/

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 89 KiB

After

Width:  |  Height:  |  Size: 40 KiB