resolving merge conflicts after updating with unisharp upstream

Author: gwleuverink

src/controllers/LfmController.php

@@ -15,13 +15,10 @@ class LfmController extends Controller
     public function __construct()
     {
         $this->applyIniOverrides();
-<<<<<<< HEAD
-        
+
         if (!$this->isProcessingImages() && !$this->isProcessingFiles()) {
             throw new \Exception('unexpected type parameter');
         }
-=======
->>>>>>> a774800cd2710ab670b0f9aaa4a9e293a7ef164a
     }
 
     /**

src/traits/LfmHelpers.php

@@ -384,12 +384,6 @@ public function allowShareFolder()
         return config('lfm.allow_share_folder') === true;
     }
 
-    public function applyIniOverrides()
-    {
-        foreach (config('lfm.php_ini_overrides') as $key => $value) {
-            if ($value && $value != 'false') ini_set($key, $value);
-        }
-    }
 
     /**
      * Overrides settings in php.ini.