edited yaml file

Author: jjcapparell

lesson_03/quiz/quiz.yaml

@@ -9,6 +9,7 @@ quiz:
     jamescapparell:
       - $2y$10$iLvL/AaFPzcGZrcna7umMuHqkZe1f9at/ix77NUI6uakDGNuVKQCy
       - $2y$10$FLxmGXJLm5EziyhA5D33ju0kUjXhiDbuUdImciLQz8lBRu5ou0hee
+<<<<<<< HEAD
       - $2y$10$9bIwC0Or.LhwAZrNL5Dvn.vjyhDF79Iw5ukm3h/oKauRCYOGSIlSK
     oyeyemijimoh:
       - $2y$10$2LlSxAEM1HmR3Wl2fO6LQueu/77spr5SuWAh4b3MKesIWNy3CFjGe
@@ -23,3 +24,6 @@ quiz:
       - $2y$10$9fZs867NHxoPQ/VWMeLyj.us5Kg3SLPcbt9O5ki/FdJ37TbhgFMFC
       - $2y$10$GfjcKvtzr6n8553Mdr1RJOOYDfzOudlW.3i8otsH0HiW52CU7tUAW
 
+=======
+      - $2y$10$hQTJ1d2giJ40AI8rSgBqWOij7j3WVqsvAMYOLFiixbYTcvETuF5cC
+>>>>>>> c159d83 (edited yaml file)

lesson_03/quiz/src/quizzes/james_capparell_quiz.ts

@@ -28,7 +28,7 @@ export class JamesCapparellQuiz implements QuizQuestionProvider {
         [AnswerChoice.C, 'New Castle County'],
         [AnswerChoice.D, 'Lancaster County'],
       ]),
-      AnswerChoice.UNANSWERED,
+      AnswerChoice.C,
     ); // Replace `UNANSWERED` with the correct answer.
   }
   private static makeQuestion1(): QuizQuestion {
@@ -41,15 +41,15 @@ export class JamesCapparellQuiz implements QuizQuestionProvider {
         [AnswerChoice.C, 'Mega Man'],
         [AnswerChoice.D, 'Pikachu'],
       ]),
-      AnswerChoice.UNANSWERED,
+      AnswerChoice.A,
     ); // Replace `UNANSWERED` with the correct answer.
   }
 
   private static makeQuestion2(): QuizQuestion {
     return new QuizQuestion(
       2,
       'Type the full answer while filling in the blanks! A _____ that transforms ____ data into ____ data using automatically executed, pre-programmed ____.',
-      'A _____ that transforms ____ data into ____ data using automatically executed, pre-programmed ____.',
+      'A computer is a machine that transforms input data to output data using automatically executed, pre-programmed instructions.',
     ); // Provide an answer.
   }
 }