ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for merge conflict on routes

Browse Source
This commit is contained in:
snipe
2015-11-30 10:19:37 -08:00
parent fffc8ed644
commit e4ceddd6ce
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/routes.php
+2 -2
View File
@@ -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' );
/*
|--------------------------------------------------------------------------