Skip to content

Commit 7e97dcd

Browse files
Dadenaike251Dadenaike251VicenteVigueras
authored andcommitted
David Adenaike Quiz (code-differently#119)
Co-authored-by: Dadenaike251 <[email protected]> Co-authored-by: Vicente Vigueras <[email protected]>
1 parent 89a7897 commit 7e97dcd

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

lesson_03/quiz/src/quizzes/quizzes.module.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ const QUIZ_PROVIDERS = [
2222
KhaylaSaundersQuiz,
2323
DylanLaffertyQuiz,
2424
RasheedMillerQuiz,
25+
<<<<<<< HEAD
2526
JasonWatsonQuiz,
27+
=======
28+
DylanLaffertyQuiz,
29+
>>>>>>> bd49b74 (David Adenaike Quiz (#119))
2630
];
2731

2832
@Module({

0 commit comments

Comments
 (0)