Skip to content

Commit

Permalink
Merge branch 'master' into prettycfg
Browse files Browse the repository at this point in the history
  • Loading branch information
JustinBeckwith committed Feb 3, 2020
2 parents d727e10 + be52100 commit 7e126f2
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 42 deletions.
4 changes: 2 additions & 2 deletions .mocharc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"enable-source-maps": true,
"timeout": 160000,
"throw-deprecation": true,
"enable-source-maps": true
"throw-deprecation": true
}
56 changes: 16 additions & 40 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7e126f2

Please sign in to comment.