mirror/php-flextype
1
0
Fork 0
mirror of https://github.com/flextype/flextype.git synced 2025-08-10 23:24:04 +02:00
Code Issues Releases Wiki Activity

fix after merge

Browse Source
This commit is contained in:
Awilum
2020-06-26 22:36:07 +03:00
parent a0a881f512
commit a047a6f312
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/flextype/bootstrap.php
View File

@@ -9,7 +9,6 @@ declare(strict_types=1);
namespace Flextype;
use Flextype\Component\Arr\Arr;
use Flextype\Component\Filesystem\Filesystem;
use Flextype\Component\Registry\Registry;
use Flextype\Component\Session\Session;
@@ -132,14 +131,11 @@ include_once 'dependencies.php';
include_once 'endpoints/access/access.php';
include_once 'endpoints/delivery/entries.php';
include_once 'endpoints/delivery/registry.php';
<<<<<<< HEAD
include_once 'endpoints/delivery/config.php';
=======
include_once 'endpoints/delivery/media/files.php';
include_once 'endpoints/delivery/media/folders.php';
>>>>>>> 428-files-api
include_once 'endpoints/management/entries.php';
include_once 'endpoints/management/config.php';
include_once 'endpoints/management/media/files.php';
include_once 'endpoints/images/images.php';
/**

5
src/flextype/config/settings.yaml
View File

@@ -256,11 +256,10 @@ api:
registry:
enabled: true
default_token:
<<<<<<< HEAD
config:
=======
enabled: true
default_token:
files:
>>>>>>> 428-files-api
enabled: true
default_token:
management: