I have created a new branch adding in Homework 3 because of a merge bug on my last branch

Author: Dlafferty251

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

@@ -3,9 +3,13 @@ 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';
@@ -22,10 +26,14 @@ 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,