Fix merge conflicts

yiisoft · Mar 3, 2024 · ff7876b · ff7876b
1 parent 0d663ac
commit ff7876b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;