config

config/admin.php

@@ -42,11 +42,9 @@ return [
     /*
      * Use `https`.
      */
-<<<<<<< HEAD
+
     'secure' => env('ADMIN_SECRET', true),
-=======
+
-    'secure' => true,
->>>>>>> 6c3143ac16e1c248e2d2a034db764146d060894a
 
     /*
      * Laravel-admin auth setting.
@@ -72,12 +70,7 @@ return [
      */
     'upload' => [
 
-<<<<<<< HEAD
         'disk' => 'admin',
-=======
-        'disk' => 'oss',
->>>>>>> 6c3143ac16e1c248e2d2a034db764146d060894a
-
         'directory' => [
             'image' => 'images',
             'file'  => 'files',

config/filesystems.php

@@ -13,11 +13,8 @@ return [
     |
     */
 
-<<<<<<< HEAD
     'default' => env('FILESYSTEM_DRIVER', 'local'),
-=======
+
-    'default' => env('FILESYSTEM_DRIVER', 'oss'),
->>>>>>> 6c3143ac16e1c248e2d2a034db764146d060894a
 
     /*
     |--------------------------------------------------------------------------