hh

2015-03-20 19:38:05 +01:00
parent d3da88d547 550ca526b9
commit aa90311348
4 changed files with 14 additions and 6 deletions
--- a/SRC/app/Http/Controllers/GameController.php
+++ b/SRC/app/Http/Controllers/GameController.php
@ -97,7 +97,12 @@ class GameController extends Controller {
            default:
                break;
        }
+<<<<<<< HEAD
        Response::make('records')->withCookie(Cookie::forever('trophee', $values));
+=======
+        
+        $response->withCookie(Cookie::forever('trophee', $values));
+>>>>>>> 550ca526b9ba7c2d56b4b5096b3bce0d7e567414
    }

 }