IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/diff–fix'

Browse Source
This commit is contained in:
Balazs Varkonyi 2015-04-04 01:56:25 +02:00
commit 0221bd0f80
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/CategoryController.php
View File

@ -185,17 +185,11 @@ class CategoryController extends Controller
return Redirect::route('categories.create')->withInput(); return Redirect::route('categories.create')->withInput();
} }
<<<<<<< HEAD
if (intval(Input::get('create_another')) === 1) { if (intval(Input::get('create_another')) === 1) {
return Redirect::route('categories.create'); return Redirect::route('categories.create');
} }
return Redirect::route('categories.index'); return Redirect::route('categories.index');
=======
// redirect to previous URL.
return Redirect::to(Session::get('categories.create.url'));
>>>>>>> release/3.3.6
} }