From a047a6f312f964fa5a9c57752a1b3530f5d16181 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Fri, 26 Jun 2020 22:36:07 +0300
Subject: [PATCH] fix after merge

---
 src/flextype/bootstrap.php        | 6 +-----
 src/flextype/config/settings.yaml | 5 ++---
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/flextype/bootstrap.php b/src/flextype/bootstrap.php
index 65fb57c1..4afa89a3 100755
--- a/src/flextype/bootstrap.php
+++ b/src/flextype/bootstrap.php
@@ -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';
 
 /**
diff --git a/src/flextype/config/settings.yaml b/src/flextype/config/settings.yaml
index 0c2204a0..8216a8e2 100644
--- a/src/flextype/config/settings.yaml
+++ b/src/flextype/config/settings.yaml
@@ -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: