From f7534041978b3b500c1b7df0eb098d17a70565b7 Mon Sep 17 00:00:00 2001
From: Petri Asikainen <petri.asikainen@sataedu.fi>
Date: Thu, 15 Jul 2021 12:01:54 +0300
Subject: [PATCH] missed this when rebasing

---
 app/Http/Controllers/Api/LocationsController.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Api/LocationsController.php b/app/Http/Controllers/Api/LocationsController.php
index f2aa645db1..2655113c23 100644
--- a/app/Http/Controllers/Api/LocationsController.php
+++ b/app/Http/Controllers/Api/LocationsController.php
@@ -2,18 +2,13 @@
 
 namespace App\Http\Controllers\Api;
 
-<<<<<<< HEAD
-=======
-use Illuminate\Http\Request;
-use App\Http\Requests\ImageUploadRequest;
-use App\Http\Controllers\Controller;
->>>>>>> f9da83bc4 (Support images and multipart requests)
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\LocationsTransformer;
 use App\Http\Transformers\SelectlistTransformer;
 use App\Models\Location;
 use Illuminate\Http\Request;
+use App\Http\Requests\ImageUploadRequest;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;