From 09a98db0f02fc6a51814b50ee52a9254ab8f3b94 Mon Sep 17 00:00:00 2001
From: Rob Allen <rob@akrabat.com>
Date: Mon, 12 Feb 2024 12:10:12 +0000
Subject: [PATCH] Remove merge artifact

---
 docs/v4/concepts/middleware.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/v4/concepts/middleware.md b/docs/v4/concepts/middleware.md
index e03a3d3f..53f7afdb 100644
--- a/docs/v4/concepts/middleware.md
+++ b/docs/v4/concepts/middleware.md
@@ -190,10 +190,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';