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