Skip to content

Commit a9d1e57

Browse files
committed
clean up after rebasing latest main branch
1 parent 3f60aa4 commit a9d1e57

File tree

2 files changed

+0
-89
lines changed

2 files changed

+0
-89
lines changed

utils/quizzes/quiz-test.json

Lines changed: 0 additions & 70 deletions
This file was deleted.

utils/quizzes/template-quiz.json

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,7 @@
3333
]
3434
},
3535
{
36-
<<<<<<< HEAD:utils/quizzes/quiz-test.json
37-
"question": "What can we use an Ethereum smart contract for?",
38-
=======
39-
"question": "What would you say is the most important aspect of OpenZeppelin contracts?",
40-
"options": [
41-
{
42-
"answer": "Their team did an amazing job with them"
43-
},
44-
{
45-
"answer": "They have been rigorously audited",
46-
"correct": true
47-
},
48-
{
49-
"answer": "Most of the original and best known Ethereum protocols use them "
50-
}
51-
]
52-
},
53-
{
5436
"question": "What can we use a smart contract for?",
55-
>>>>>>> Add mini-quiz file path placeholders + 40% of mini-quiz content:utils/quizzes/template-quiz.json
5637
"options": [
5738
{
5839
"answer": "Storing or transfering value without the need of a central authority",

0 commit comments

Comments
 (0)