Merge pull request #698 from akrabat/696-fix-merge

Remove merge artifact
slimphp · Feb 12, 2024 · 291b7a7 · 291b7a7
2 parents 8efbe33 + 09a98db
commit 291b7a7
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/docs/v4/concepts/middleware.md b/docs/v4/concepts/middleware.md
@@ -193,10 +193,6 @@ use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Server\RequestHandlerInterface as RequestHandler;
 use Slim\Factory\AppFactory;
-<<<<<<< HEAD
-use Psr\Http\Message\ResponseInterface as Response;
-=======
->>>>>>> c9ce721 (Fix Response instantiation)
 
 require __DIR__ . '/../vendor/autoload.php';