Skip to content

Commit c6ccff7

Browse files
author
“A1-4U2T1NN”
committed
fix: fixed merge conflicts;
1 parent 613d798 commit c6ccff7

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

lesson_03/quiz/quiz.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@ quiz:
66
anotherone:
77
- $2y$10$8eHSzy3aCu4Ry3LzO9nWCeGpofSxsNVbnF.wCfn3ZADwQ6MEtN/KK
88
- $2y$10$dGB0CGv7.XQC5OqfyY6iXOiJsdVyxU3ve5YE0gt4m2I8P8H13lNXa
9-
<<<<<<< HEAD
109
chigazograham:
1110
- $2y$10$OTnSih9kHykUnsuM/YKufu3MXTpOZrif.dL13XwXt8rquJL4mV.m.
1211
- $2y$10$je60MntrKRBd/1tz7hNUY.D/cyKOEM.hp6/1fVVVGJRIIitmUGI5e
1312
- $2y$10$pPTmEp0acs8.NIAamLpmmuF7B72bXFZsikHywQI/JvfXuySkhHH5S
14-
=======
1513
oyeyemijimoh:
1614
- $2y$10$2LlSxAEM1HmR3Wl2fO6LQueu/77spr5SuWAh4b3MKesIWNy3CFjGe
1715
- $2y$10$csA90DFxK7.uq6dSfS06Yukk5fQPrzLvU2Lp43ArTs2za28LVvRGO
@@ -24,4 +22,3 @@ quiz:
2422
- $2y$10$XcsVuO66KZiUiN75NtssdOkKvHKhuBo91JgE/TJEnSrrzbhjxuql.
2523
- $2y$10$9fZs867NHxoPQ/VWMeLyj.us5Kg3SLPcbt9O5ki/FdJ37TbhgFMFC
2624
- $2y$10$GfjcKvtzr6n8553Mdr1RJOOYDfzOudlW.3i8otsH0HiW52CU7tUAW
27-
>>>>>>> aa65ed15f6ebd5de0b1eea920d60a6b03179f545

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const QUIZ_PROVIDERS = [
1616
AnotherQuiz,
1717
JosephCaballeroQuiz,
1818
OyeyemiJimohQuiz,
19-
, ChigazoGrahamsQuiz];
19+
ChigazoGrahamsQuiz];
2020

2121
@Module({
2222
providers: [

0 commit comments

Comments
 (0)