Skip to content

Commit e73c5ce

Browse files
zoebentleyericrosenbaum
authored andcommitted
Changed order of tutorials
# Conflicts: # package-lock.json # package.json
1 parent be8873a commit e73c5ce

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/lib/libraries/decks/index.jsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,12 @@ import libraryPong from './thumbnails/pong.jpg';
4444

4545
// Imagine a World
4646
import libraryImagine from './thumbnails/imagine.jpg';
47+
<<<<<<< HEAD
4748

4849
// Code a Cartoon
4950
import libraryCodeCartoon from './thumbnails/code-a-cartoon.jpg';
51+
=======
52+
>>>>>>> 395b55868bbab8c3ef1e66c7dd1d1fa9d1eeca1a
5053

5154
// Videos
5255
import recordASound from './thumbnails/record-a-sound.jpg';

0 commit comments

Comments
 (0)