Skip to content

Commit 324db1f

Browse files
squash!
1 parent dd684ef commit 324db1f

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

.gitignore

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<<<<<<< HEAD
21
_build
32
node_modules
43

@@ -8,15 +7,4 @@ node_modules
87
.idea
98

109
*.sublime-project
11-
=======
12-
_build
13-
node_modules
14-
15-
.DS_Store
16-
.vscode/spell.json
17-
18-
.idea
19-
20-
*.sublime-project
21-
>>>>>>> upstream/master
2210
*.sublime-workspace

0 commit comments

Comments
 (0)