Adding Khayals Quiz

Author: Dlafferty251

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

@@ -2,14 +2,7 @@ import { Module } from '@nestjs/common';
 import { AnotherQuiz } from './another_quiz.js';
 import { AnthonyMaysQuiz } from './anthony_mays_quiz.js';
 import { DavidAdenaikeQuiz } from './david_adenaike_quiz.js';
-<<<<<<< HEAD
-<<<<<<< HEAD
 import { DylanLaffertyQuiz } from './dylan_lafferty_quiz.js';
-=======
->>>>>>> 8cf96e4 (chore: adds Khyla's custom quiz (#120))
-=======
-import { DylanLaffertyQuiz } from './dylan_lafferty_quiz.js';
->>>>>>> 2e39b77 (I have created a new branch adding in Homework 3 because of a merge bug on my last branch)
 import { Jbeyquiz } from './jbeyquiz.js';
 import { KhaylaSaundersQuiz } from './khayla_quiz.js';
 import { MeikoStephensQuiz } from './meiko_stephens_quiz.js';
@@ -26,26 +19,8 @@ const QUIZ_PROVIDERS = [
   Jbeyquiz,
   DavidAdenaikeQuiz,
   KhaylaSaundersQuiz,
-<<<<<<< HEAD
-<<<<<<< HEAD
-  DylanLaffertyQuiz,
-=======
->>>>>>> 8cf96e4 (chore: adds Khyla's custom quiz (#120))
-=======
-  DylanLaffertyQuiz,
->>>>>>> 2e39b77 (I have created a new branch adding in Homework 3 because of a merge bug on my last branch)
-  RasheedMillerQuiz,
   DylanLaffertyQuiz,
   RasheedMillerQuiz,
-<<<<<<< HEAD
-<<<<<<< HEAD
-  DavidAdenaikeQuiz,
-=======
-  DylanLaffertyQuiz,
->>>>>>> bd49b74 (David Adenaike Quiz (#119))
-=======
-  DavidAdenaikeQuiz,
->>>>>>> 76dab3b (I have created a new branch adding in Homework 3 because of a merge bug on my last branch)
 ];
 
 @Module({