suppression des ajouts du merge

2 years ago · 7abe0a46cb
parent 397b2f7398
commit 7abe0a46cb
1 changed files with 0 additions and 11 deletions
--- a/WEB/Controller/UserController.php
+++ b/WEB/Controller/UserController.php
@ -217,7 +217,6 @@ class UserController
            require($rep . $vues['erreur']);
        }
    }
-<<<<<<< HEAD
    public function launchGame(){
        try {
            global $rep, $vues, $error;
@ -230,16 +229,6 @@ class UserController
            require($rep . $vues['erreur']);
        }
    }
-=======
-    // public function launchGame(){
-    //     try {
-    //         global $rep, $vues, $error;
-    //         $model = new UserModel();
-    //         $model->launchGame();
-    //         require($rep . $vues['partie']);
-    //     }
-    // }
->>>>>>> ec72c626e295121e440c26605682865659b9012b
    public function logout()
    {
        $_SESSION['role'] = 'visitor';