fixing conflic merge

yaza-putu · Dec 2, 2022 · 50d2472 · 50d2472
1 parent b402e51
commit 50d2472
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/LaravelGoogleDriveStorageServiceProvider.php b/src/LaravelGoogleDriveStorageServiceProvider.php
@@ -28,8 +28,6 @@ public function configurePackage(Package $package): void
     public function bootingPackage()
     {
         try {
-<<<<<<< HEAD
-=======
             app()->config['filesystems.disks.google'] = [
                 'driver' => 'google',
                 'clientId' => env('GOOGLE_DRIVE_CLIENT_ID'),
@@ -39,7 +37,6 @@ public function bootingPackage()
                 //'teamDriveId' => env('GOOGLE_DRIVE_TEAM_DRIVE_ID'),
             ];
 
->>>>>>> development
             Storage::extend('google', function ($app, $config) {
                 $options = [];