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

modified: app/Http/Controllers/GameController.php

Browse Source
This commit is contained in:
Malibu 2015-03-20 19:39:13 +01:00
parent aa90311348
commit abc37ce412
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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