gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix/conflicts

Browse Source
This commit is contained in:
moT01
2019-05-31 21:11:59 -05:00
committed by Kristofer Koishigawa
parent 61895e05f7
commit ffc3a827c2
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
curriculum/challenges/_meta/es6/meta.json
View File

@ -99,13 +99,10 @@
[ [
"587d7b8c367417b2b2512b56", "587d7b8c367417b2b2512b56",
"Use export to Share a Code Block" "Use export to Share a Code Block"
<<<<<<< HEAD
], ],
[ [
"587d7b8c367417b2b2512b55", "587d7b8c367417b2b2512b55",
"Reuse Javascript Code Using import" "Reuse Javascript Code Using import"
=======
>>>>>>> fix/rename-lessons
], ],
[ [
"587d7b8c367417b2b2512b55", "587d7b8c367417b2b2512b55",