From e4ceddd6ce246d5864b075a1dd0c1f891ef2f8b1 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 30 Nov 2015 10:19:37 -0800 Subject: [PATCH] Fix for merge conflict on routes --- app/routes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/routes.php b/app/routes.php index ca3a3778b2..35497528ee 100755 --- a/app/routes.php +++ b/app/routes.php @@ -137,8 +137,8 @@ # Custom fieldset //Route::get('/custom_fieldsets/{id}','CustomFieldsController@show'); //Route::get('/custom_fieldsets/create','CustomFieldsController@getCreate'); - Route::post('/custom_fieldsets/{id}/associate','CustomFieldsController@postAssociate'); - Route::controller('/custom_fieldsets','CustomFieldsController' ); + //Route::post('/custom_fieldsets/{id}/associate','CustomFieldsController@postAssociate'); + //Route::controller('/custom_fieldsets','CustomFieldsController' ); /* |--------------------------------------------------------------------------