j'avais oublier un <<

pull/25/head
kevin.modejar 5 months ago
parent ca81cd84bf
commit cd767ee45a

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

Loading…
Cancel
Save