feat/new-lessons-on-js-promises

This commit is contained in:
moT01
2019-05-14 14:52:01 -05:00
committed by Kristofer Koishigawa
parent 73bdff45fd
commit da254743cd
7 changed files with 766 additions and 1 deletions

View File

@@ -115,8 +115,48 @@
[
"587d7b8d367417b2b2512b59",
"Import a Default Export"
],
[
"5cdafbb0291309899753167f",
<<<<<<< HEAD
<<<<<<< HEAD
"Create a JavaScript Promise"
],
[
"5cdafbc32913098997531680",
"Complete a Promise with Resolve and Reject"
],
[
"5cdafbd72913098997531681",
"Handle a Fulfilled Promise with then"
],
[
"5cdafbe72913098997531682",
"Handle a Rejected Promise with catch"
=======
"Create a Javascript Promise"
=======
"Create a JavaScript Promise"
>>>>>>> 950f80a92... Update curriculum/challenges/_meta/es6/meta.json
],
[
"5cdafbc32913098997531680",
"Complete a Promise with Resolve and Reject"
],
[
"5cdafbd72913098997531681",
"Handle a Fulfilled Promise with then"
],
[
"5cdafbe72913098997531682",
<<<<<<< HEAD
"Handle a Rejected Promise with .catch"
>>>>>>> 5aba19817... feat/new-lessons-on-js-promises
=======
"Handle a Rejected Promise with catch"
>>>>>>> 8dec9d7c7... fix/add-tests-rename-files
]
],
"helpRoom": "Help",
"fileName": "02-javascript-algorithms-and-data-structures/es6.json"
}
}