fix/conflicts
This commit is contained in:
committed by
Kristofer Koishigawa
parent
61895e05f7
commit
ffc3a827c2
@ -99,13 +99,10 @@
|
||||
[
|
||||
"587d7b8c367417b2b2512b56",
|
||||
"Use export to Share a Code Block"
|
||||
<<<<<<< HEAD
|
||||
],
|
||||
[
|
||||
"587d7b8c367417b2b2512b55",
|
||||
"Reuse Javascript Code Using import"
|
||||
=======
|
||||
>>>>>>> fix/rename-lessons
|
||||
],
|
||||
[
|
||||
"587d7b8c367417b2b2512b55",
|
||||
|
Reference in New Issue
Block a user