- Fixed conflicts

src/ApplicationStrategy.php

@@ -38,4 +38,37 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
     {
         return $this->getContainer()->has(MethodNotAllowedInterface::class) ? $this->getContainer()->get(MethodNotAllowedInterface::class) : parent::getMethodNotAllowedDecorator($exception);
     }
+    /*
+<<<<<<< HEAD
+    public function getMethodNotAllowedDecorator(MethodNotAllowedException $exception): MiddlewareInterface
+    {
+        return $this->getContainer()->has(MethodNotAllowedInterface::class) ? $this->getContainer()->get(MethodNotAllowedInterface::class) : parent::getMethodNotAllowedDecorator($exception);
+=======
+            public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+            {
+                if (php_sapi_name() !== 'cli' and ! defined('STDIN'))  {
+                    return $this->throw404($request);
+                }
+
+                return $handler->handle($request);;
+            }
+
+            public function throw404(ServerRequestInterface $request) : ResponseInterface
+            {
+                if ( getenv('DEBUG') && $this->di->has(\Picea\Asset\Asset::class) ) {
+                    $params = $request->getServerParams();
+
+                    $scpName = basename(explode('?', $params['REQUEST_URI'] ?? "", 2)[0]);
+                    list(, $ext) = array_pad(explode('.', $scpName), 2, null);
+
+                    if ($ext && in_array($ext, ApplicationStrategy::ASSET_TRIGGER_UPDATE)) {
+                        $this->di->get(\Picea\Asset\Asset::class)->launchInstall();
+                    }
+                }
+
+                return $this->di->get('error.404');
+            }
+        };
+>>>>>>> af8b686 (- WIP on ulmus-user mechanics updates)
+    }*/
 }