- Rebased

src/ApplicationStrategy.php

@@ -38,7 +38,6 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
     {
         return $this->getContainer()->has(MethodNotAllowedInterface::class) ? $this->getContainer()->get(MethodNotAllowedInterface::class) : parent::getMethodNotAllowedDecorator($exception);
     }
-<<<<<<< HEAD
 
 /*<<<<<<< HEAD
         /*=======
@@ -72,6 +71,4 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
     }
 
 >>>>>>> af8b686 (- WIP on ulmus-user mechanics updates)*/
-=======
->>>>>>> 06c4f46 (- Added MethodNotAllowed interface)
 }