Skip to content

Commit f1f6553

Browse files
authored
Merge pull request #78 from apark0720/master
upload gif to public
2 parents 9468b28 + 5567de9 commit f1f6553

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

public/appDemo - Copy.gif

2 MB
Loading

src/containers/NavBar/__tests__/navBar.test.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
test('renders the export file modal when the open new folder button is clicked', () => {});
22

3+
<<<<<<< HEAD
4+
test('renders the export file modal when the open new folder button is clicked', () => {
5+
});
6+
=======
37
test('loads new project when new project is selected from modal', () => {});
48

59
test('displays correct file name on project directory panel', () => {});
10+
>>>>>>> 9468b287d7e918c9d06987fc60e2b7b97dbb76c5
611

712
test('displays code view when code view button is clicked', () => {});
813

0 commit comments

Comments
 (0)