From ff7876b1202984c2ff39e2bf6e89581e613f7d2e Mon Sep 17 00:00:00 2001
From: Dmitrii Derepko <xepozz@list.ru>
Date: Sun, 3 Mar 2024 09:17:09 +0700
Subject: [PATCH] Fix merge conflicts

---
 config/routes.php                                  | 2 +-
 src/Inspector/Controller/DebugServerController.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/routes.php b/config/routes.php
index a0a7344..5a80407 100644
--- a/config/routes.php
+++ b/config/routes.php
@@ -9,11 +9,11 @@
 use Yiisoft\Router\Route;
 use Yiisoft\Validator\ValidatorInterface;
 use Yiisoft\Yii\Debug\Api\Debug\Controller\DebugController;
-use Yiisoft\Yii\Debug\Api\Debug\Controller\DebugServerController;
 use Yiisoft\Yii\Debug\Api\Debug\Middleware\ResponseDataWrapper;
 use Yiisoft\Yii\Debug\Api\Inspector\Controller\CacheController;
 use Yiisoft\Yii\Debug\Api\Inspector\Controller\CommandController;
 use Yiisoft\Yii\Debug\Api\Inspector\Controller\ComposerController;
+use Yiisoft\Yii\Debug\Api\Inspector\Controller\DebugServerController;
 use Yiisoft\Yii\Debug\Api\Inspector\Controller\GitController;
 use Yiisoft\Yii\Debug\Api\Inspector\Controller\InspectController;
 use Yiisoft\Yii\Middleware\CorsAllowAll;
diff --git a/src/Inspector/Controller/DebugServerController.php b/src/Inspector/Controller/DebugServerController.php
index f3b44b0..b4782e7 100644
--- a/src/Inspector/Controller/DebugServerController.php
+++ b/src/Inspector/Controller/DebugServerController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\Debug\Api\Controller;
+namespace Yiisoft\Yii\Debug\Api\Inspector\Controller;
 
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;