diff options
author | ArthurHoaro <arthur@hoa.ro> | 2020-10-27 19:55:29 +0100 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2020-10-27 19:55:29 +0100 |
commit | 54afb1d6f65f727b20b66582bb63a42c421eea4d (patch) | |
tree | 8e3eb3e10088dc4f52e58f2c8cf80f68fc26dbf9 /application/front | |
parent | 36e6d88dbfd753665224664d5214f39ccfbbf6a5 (diff) | |
download | Shaarli-54afb1d6f65f727b20b66582bb63a42c421eea4d.tar.gz Shaarli-54afb1d6f65f727b20b66582bb63a42c421eea4d.tar.zst Shaarli-54afb1d6f65f727b20b66582bb63a42c421eea4d.zip |
Fix rebase issue
Diffstat (limited to 'application/front')
-rw-r--r-- | application/front/controller/admin/ServerController.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/application/front/controller/admin/ServerController.php b/application/front/controller/admin/ServerController.php index 85654a43..bfc99422 100644 --- a/application/front/controller/admin/ServerController.php +++ b/application/front/controller/admin/ServerController.php | |||
@@ -4,8 +4,8 @@ declare(strict_types=1); | |||
4 | 4 | ||
5 | namespace Shaarli\Front\Controller\Admin; | 5 | namespace Shaarli\Front\Controller\Admin; |
6 | 6 | ||
7 | use Shaarli\ApplicationUtils; | 7 | use Shaarli\Helper\ApplicationUtils; |
8 | use Shaarli\FileUtils; | 8 | use Shaarli\Helper\FileUtils; |
9 | use Slim\Http\Request; | 9 | use Slim\Http\Request; |
10 | use Slim\Http\Response; | 10 | use Slim\Http\Response; |
11 | 11 | ||