From 5f3e3d37086313f4f76ebad89291af2d8bd9a40f Mon Sep 17 00:00:00 2001 From: Jerome Morjon Date: Fri, 20 Mar 2015 19:39:46 +0100 Subject: [PATCH] maj response --- SRC/app/Http/Controllers/GameController.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/SRC/app/Http/Controllers/GameController.php b/SRC/app/Http/Controllers/GameController.php index 0f98b15..288ef21 100755 --- a/SRC/app/Http/Controllers/GameController.php +++ b/SRC/app/Http/Controllers/GameController.php @@ -97,12 +97,9 @@ class GameController extends Controller { default: break; } -<<<<<<< HEAD - Response::make('records')->withCookie(Cookie::forever('trophee', $values)); -======= + $response->withCookie(Cookie::forever('trophee', $values)); ->>>>>>> 550ca526b9ba7c2d56b4b5096b3bce0d7e567414 } }