File tree Expand file tree Collapse file tree 1 file changed +6
-0
lines changed
lesson_03/quiz/src/quizzes Expand file tree Collapse file tree 1 file changed +6
-0
lines changed Original file line number Diff line number Diff line change @@ -2,7 +2,10 @@ import { Module } from '@nestjs/common';
2
2
import { AnotherQuiz } from './another_quiz.js' ;
3
3
import { AnthonyMaysQuiz } from './anthony_mays_quiz.js' ;
4
4
import { DavidAdenaikeQuiz } from './david_adenaike_quiz.js' ;
5
+ < < < << << HEAD
5
6
import { DylanLaffertyQuiz } from './dylan_lafferty_quiz.js' ;
7
+ === === =
8
+ >>> >>> > 8 cf96e4 ( chore : adds Khyla 's custom quiz (#120))
6
9
import { Jbeyquiz } from './jbeyquiz.js' ;
7
10
import { KhaylaSaundersQuiz } from './khayla_quiz.js' ;
8
11
import { MeikoStephensQuiz } from './meiko_stephens_quiz.js' ;
@@ -19,7 +22,10 @@ const QUIZ_PROVIDERS = [
19
22
Jbeyquiz ,
20
23
DavidAdenaikeQuiz ,
21
24
KhaylaSaundersQuiz ,
25
+ < < < << << HEAD
22
26
DylanLaffertyQuiz ,
27
+ = === ===
28
+ >>> >>> > 8 cf96e4 ( chore : adds Khyla 's custom quiz (#120))
23
29
RasheedMillerQuiz ,
24
30
DylanLaffertyQuiz ,
25
31
RasheedMillerQuiz ,
You can’t perform that action at this time.
0 commit comments