Skip to content

Commit de24ae1

Browse files
michaelolofmichaelolof
committed
resolved merge conflicts
2 parents 0dc2774 + 19e3620 commit de24ae1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+3608
-1226
lines changed

‎.gitignore‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
.vscode/
2-
test-js/
1+
node_modules/
32
test-ts/
4-
node_modules/
3+
test-js/

‎.vscode/settings.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"files.exclude": {
3+
"node_modules": true,
4+
"test-js/node_modules": true,
5+
"test-ts/node_modules": true
6+
}
7+
}

0 commit comments

Comments
 (0)