Skip to content

Commit

Permalink
Merge branch 'master' into v4
Browse files Browse the repository at this point in the history
  • Loading branch information
jamescdavis authored Jul 2, 2020
2 parents 6125853 + ec3aedf commit c964f50
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
"prettier": "2.0.5",
"prettier-eslint": "11.0.0",
"qunit-dom": "1.2.0",
"rimraf": "^3.0.2",
"rimraf": "3.0.2",
"testdouble": "3.16.0",
"ts-node": "8.10.2",
"typescript": "3.7.5"
Expand Down
8 changes: 3 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9983,12 +9983,10 @@ imurmurhash@^0.1.4:
integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=

"in-repo-a@link:tests/dummy/lib/in-repo-a":
version "0.0.0"
uid ""
version "1.0.0"

"in-repo-b@link:tests/dummy/lib/in-repo-b":
version "0.0.0"
uid ""
version "1.0.0"

include-path-searcher@^0.1.0:
version "0.1.0"
Expand Down Expand Up @@ -14750,7 +14748,7 @@ [email protected], rimraf@~2.6.1, rimraf@~2.6.2:
dependencies:
glob "^7.1.3"

rimraf@^3.0.0, rimraf@^3.0.1, rimraf@^3.0.2:
rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.1, rimraf@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
Expand Down

0 comments on commit c964f50

Please sign in to comment.