- Merged with master done

meta/definitions/http.php

@@ -2,11 +2,6 @@
 
 use Lean\ApplicationStrategy\{ ThrowableHandler, ThrowableHandlerInterface, NotFoundDecoratorInterface, NotFoundDecorator, MethodNotAllowedInterface,  };
 use Psr\Container\ContainerInterface;
-<<<<<<< HEAD
-=======
-
-use Lean\ApplicationStrategy\{ ThrowableHandler, ThrowableHandlerInterface, NotFoundDecoratorInterface, NotFoundDecorator, MethodNotAllowedInterface,  };
->>>>>>> ca388e8 (- Merged with master done)
 use Psr\Http\Message\ServerRequestInterface;
 use Laminas\{ Diactoros\ServerRequestFactory, HttpHandlerRunner\Emitter\EmitterInterface, HttpHandlerRunner\Emitter\SapiEmitter };
 use Lean\Factory\{ HttpFactory, HttpFactoryInterface };
@@ -39,13 +34,5 @@ return [
 
     'error.500' => function(ContainerInterface $c, Picea $picea) {
         return $c->get(HttpFactoryInterface::class)::createHtmlResponse($picea->renderHtml("lean/error/500", []), 500);
-<<<<<<< HEAD
     }
-=======
-    },
-
-    ThrowableHandlerInterface::class => autowire(ThrowableHandler::class),
-    NotFoundDecoratorInterface::class => autowire(NotFoundDecorator::class),
-    # MethodNotAllowedInterface::class => autowire(MethodNotAllowedDecorator::class),
->>>>>>> ca388e8 (- Merged with master done)
 ];