Skip to content

Commit c6fedbb

Browse files
authored
Merge pull request #10 from oslabs-beta/dev
Merge Dev to Master
2 parents c07a052 + 3e4726b commit c6fedbb

File tree

217 files changed

+39163
-50515
lines changed

Some content is hidden

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

217 files changed

+39163
-50515
lines changed

.gitignore

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
# JS Project-Specific #
22
#######################
33
# node_modules
4-
dist
5-
build
4+
/dist
5+
/build
66
release-builds
77
coverage
88
__tests__/**/__snapshots__
99
.env
10-
users.json
11-
test_users.json
10+
databases.txt
1211

1312
# Compiled source #
1413
###################
@@ -48,3 +47,5 @@ test_users.json
4847
ehthumbs.db
4948
Thumbs.db
5049
node_modules
50+
51+
out/

.vscode/launch.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
{
22
"version": "0.2.0",
33
"configurations": [
4+
{
5+
"type": "node",
6+
"request": "launch",
7+
"name": "File",
8+
"skipFiles": [
9+
"<node_internals>/**",
10+
],
11+
"program": "${file}"
12+
},
413
{
514
"type": "node",
615
"request": "launch",

.vscode/settings.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)