QRouland/ModuleWeb
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

maj response

Browse Source
This commit is contained in:
Jerome Morjon 2015-03-20 19:39:46 +01:00
parent 8c0e7c0d36
commit 5f3e3d3708
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SRC/app/Http/Controllers/GameController.php
View File

@ -97,12 +97,9 @@ class GameController extends Controller {
default: default:
break; break;
} }
<<<<<<< HEAD
Response::make('records')->withCookie(Cookie::forever('trophee', $values));
=======
$response->withCookie(Cookie::forever('trophee', $values)); $response->withCookie(Cookie::forever('trophee', $values));
>>>>>>> 550ca526b9ba7c2d56b4b5096b3bce0d7e567414
} }
} }