From 28216cbcb5064987a9132f7d6f0009b63dc72acc Mon Sep 17 00:00:00 2001 From: Balazs Varkonyi Date: Sat, 4 Apr 2015 01:56:19 +0200 Subject: [PATCH] Removed merge conflict from CategoryController --- app/Http/Controllers/CategoryController.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 619e61748f..b664ec6566 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -185,17 +185,11 @@ class CategoryController extends Controller return Redirect::route('categories.create')->withInput(); } -<<<<<<< HEAD if (intval(Input::get('create_another')) === 1) { return Redirect::route('categories.create'); } return Redirect::route('categories.index'); -======= - // redirect to previous URL. - return Redirect::to(Session::get('categories.create.url')); ->>>>>>> release/3.3.6 - }