Small merge unmagling

Signed-off-by: snipe <snipe@snipe.net>

app/Http/Controllers/Api/SettingsController.php

@@ -17,7 +17,6 @@ use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Notification;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator; 
-use App\Models\Ldap; // forward-port of v4 LDAP model for Sync
 use App\Http\Requests\SlackSettingsRequest;
 
 
@@ -166,7 +165,7 @@ class SettingsController extends Controller
         }
     }
 
-    public function slacktest(Request $request)
+    public function slacktest(SlackSettingsRequest $request)
     {
 
         $validator = Validator::make($request->all(), [

app/Http/Controllers/CustomFieldsController.php

@@ -153,10 +153,6 @@ class CustomFieldsController extends Controller
                 ->with("success", trans('admin/custom_fields/message.field.delete.success'));
         }
 
-            return redirect()->route('fields.index')
-                ->with('success', trans('admin/custom_fields/message.field.delete.success'));
-        }
-
         return redirect()->back()->withErrors(['message' => 'Field does not exist']);
     }
 

app/Http/Controllers/SettingsController.php

@@ -21,7 +21,6 @@ use Image;
 use Input;
 use Redirect;
 use Response;
-use App\Helpers\StorageHelper;
 use App\Http\Requests\SlackSettingsRequest;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Artisan;