diff --git a/src/Controleur/UserControler.php b/src/Controleur/UserControler.php index 24a421c..34c093c 100644 --- a/src/Controleur/UserControler.php +++ b/src/Controleur/UserControler.php @@ -31,12 +31,10 @@ class UserControler { private QuoteModel $qMod; private CharacterModel $caMod; private SourceModel $srcMod; -<<<<<<< HEAD private QuestionModel $questMod; private ImageModel $iMod; -======= private QuizModel $quizModel; ->>>>>>> 8c848bc67dd41069816daf4d55dbca81ab1d3033 + public function __construct() { global $co; @@ -46,9 +44,7 @@ class UserControler { $this -> questMod = new QuestionModel(new QuestionGateway($co)); $this -> caMod = new CharacterModel(new CharacterGateway($co)); $this->srcMod = new SourceModel(new SourceGateway($co)); -<<<<<<< HEAD $this->iMod = new ImageModel(new ImageGateway($co)); -======= $this->quizModel = new QuizModel(new QuizGateway($co)); } @@ -56,7 +52,6 @@ class UserControler { global $vues; $quizs = $this->quizModel->listQuiz(); require_once $vues['accueilQuiz']; ->>>>>>> 8c848bc67dd41069816daf4d55dbca81ab1d3033 } public function profil() {